X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67246edee2f3e840c64921c5d833c29823398bb3..a1665b22b07c572a240f9d83783044e3e4f9cb0e:/src/jpeg/jconfig.h

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index 9594ec56bb..2bf765bb68 100644
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -1,13 +1,34 @@
+/* This test added by JACS as a quick fix. What should we do
+ * to make it work with configure?
+ */
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+#include "jconfig.vc"
+#else
+
 /* jconfig.h.  Generated automatically by configure.  */
 /* 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
-#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
@@ -20,7 +41,11 @@
 #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
@@ -43,3 +68,6 @@
 #undef PROGRESS_REPORT
 
 #endif /* JPEG_CJPEG_DJPEG */
+#endif
+    /* _MSC_VER */
+