moved the definition of OPJ_ARG_NOT_USED from opj_includes.h to openjpeg.h

diff --git a/CHANGES b/CHANGES
index 9402b7de6c27c125f2257fa1160eb61b367cdd3b..68f07ce8296be0f927e88ab5f9f205ff05b27b23 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ August 10, 2011
 ! [mickael] add copyright header into new test functions.
 * [mickael] fixed glibc error with broken2 and broken4 images.
 * [mickael] fixed segfault with 123.j2c and bug.j2c images (thanks to Tim Mattox for his improvement).
+! [mickael] moved the definition of OPJ_ARG_NOT_USED from opj_includes.h to openjpeg.h
 
 August 9, 2011
 - [antonin] removed xcode project files (cmake and autotools are now the only supported build methods)

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index dfc4dc6468941d424185ea5e4f254ef3d567b4af..c46d896f730038f0cfcdb38669c51ec6445006c6 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -63,6 +63,8 @@ typedef int opj_bool;
 #define OPJ_TRUE 1
 #define OPJ_FALSE 0
 
+// Avoid compile-time warning because parameter is not used
+#define OPJ_ARG_NOT_USED(x) (void)(x)
 /* 
 ==========================================================
    Useful constant definitions

diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h
index 8da9dbdc0a39bcb5a4fe7f86739ba6d2ee95bfac..53a0c4a7215b1f30b35da357123622138869122b 100644 (file)
--- a/libopenjpeg/opj_includes.h
+++ b/libopenjpeg/opj_includes.h
@@ -104,9 +104,6 @@ static INLINE long lrintf(float f){
 }
 #endif
 
-// Avoid compile-time warning because parameter is not used
-#define OPJ_ARG_NOT_USED(x) (void)(x)
-
 #include "j2k_lib.h"
 #include "opj_malloc.h"
 #include "event.h"