jconfig.h uses configures results

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index 9594ec56bb8394e0320154a3a184ab422a01f524..8913296008d502e398d82342cd1c7d464bccb098 100644 (file)
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -2,12 +2,25 @@
 /* jconfig.cfg --- source file edited by configure script */
 /* see jconfig.doc for explanations */
 
 /* jconfig.cfg --- source file edited by configure script */
 /* see jconfig.doc for explanations */
 

+/* use wxWindows' configure */
+#include "wx/setup.h"
+

 #define HAVE_PROTOTYPES 
 #define HAVE_UNSIGNED_CHAR 
 #define HAVE_UNSIGNED_SHORT 
 #undef void
 #undef const
 #define HAVE_PROTOTYPES 
 #define HAVE_UNSIGNED_CHAR 
 #define HAVE_UNSIGNED_SHORT 
 #undef void
 #undef const

-#undef CHAR_IS_UNSIGNED
+
+/* use wxWindows' configure */
+/* #undef CHAR_IS_UNSIGNED */
+#ifdef __CHAR_UNSIGNED__
+  #ifndef CHAR_IS_UNSIGNED
+    #define CHAR_IS_UNSIGNED
+  #endif
+#else
+  #undef CHAR_IS_UNSIGNED
+#endif
+

 #define HAVE_STDDEF_H 
 #define HAVE_STDLIB_H 
 #undef NEED_BSD_STRINGS
 #define HAVE_STDDEF_H 
 #define HAVE_STDLIB_H 
 #undef NEED_BSD_STRINGS


@@ -20,7 +33,11 @@
 #ifdef JPEG_INTERNALS
 
 #undef RIGHT_SHIFT_IS_UNSIGNED
 #ifdef JPEG_INTERNALS
 
 #undef RIGHT_SHIFT_IS_UNSIGNED

-#define INLINE __inline__
+
+/* use wxWindows' configure */
+/* #define INLINE __inline__ */
+#define INLINE inline
+

 /* These are for configuring the JPEG memory manager. */
 #undef DEFAULT_MAX_MEM
 #undef NO_MKTEMP
 /* These are for configuring the JPEG memory manager. */
 #undef DEFAULT_MAX_MEM
 #undef NO_MKTEMP