Modification of the context numbers, to reflect what has been specified in standard.

[openjpeg.git] / libopenjpeg / opj_includes.h

diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h
index 2a78fca155cd6c0e51608780aeceb13bfde10d74..4d48f2c8b9890b2e268170d4b0174ed174259236 100644 (file)
--- a/libopenjpeg/opj_includes.h
+++ b/libopenjpeg/opj_includes.h
@@ -23,8 +23,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
-
 #ifndef OPJ_INCLUDES_H
 #define OPJ_INCLUDES_H
 
@@ -33,7 +31,6 @@
    Standard includes used by the library
  ==========================================================
 */
-#include <setjmp.h>
 #include <memory.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,6 +39,7 @@
 #include <time.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <ctype.h>
 
 /*
  ==========================================================
@@ -56,6 +54,23 @@
  ==========================================================
 */
 
+/*
+The inline keyword is supported by C99 but not by C90. 
+Most compilers implement their own version of this keyword ... 
+*/
+#ifndef INLINE
+       #if defined(_MSC_VER)
+               #define INLINE __inline
+       #elif defined(__GNUC__)
+               #define INLINE __inline__
+       #elif defined(__MWERKS__)
+               #define INLINE inline
+       #else 
+               /* add other compilers here ... */
+               #define INLINE 
+       #endif /* defined(<Compiler>) */
+#endif /* INLINE */
+
 #include "j2k_lib.h"
 #include "event.h"
 #include "cio.h"
@@ -78,5 +93,10 @@
 #include "int.h"
 #include "fix.h"
 
+/* JPWL>> */
+#ifdef USE_JPWL
+#include "../jpwl/jpwl.h"
+#endif /* USE_JPWL */
+/* <<JPWL */
 
 #endif /* OPJ_INCLUDES_H */