Moved type OPJ_BITFIELD from openjpeg.h to opj_includes.h

OPJ_BITFIELD is used only in internal headers and must not appear in the public openjpeg.h header.
uclouvain · Sep 7, 2016 · 8750e18 · 8750e18
1 parent 6c83f14
commit 8750e18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h
@@ -129,8 +129,6 @@ typedef uint64_t OPJ_UINT64;
 
 typedef int64_t  OPJ_OFF_T; /* 64-bit file offset type */
 
-typedef unsigned int OPJ_BITFIELD;
-
 #include <stdio.h>
 typedef size_t   OPJ_SIZE_T;
 

diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h
@@ -183,6 +183,9 @@ static INLINE long opj_lrintf(float f) {
 #	pragma intrinsic(__emul)
 #endif
 
+/* Type to use for bit-fields in internal headers */
+typedef unsigned int OPJ_BITFIELD;
+
 #include "opj_inttypes.h"
 #include "opj_clock.h"
 #include "opj_malloc.h"