Fix broken and missing DataView interface items for Phoenix

[wxWidgets.git] / src / jpeg / jconfig.h

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index 3593170ff8dad56cddbb8f5a9c4ae145f7100da7..c8afdeb56edfc9bf673a00c912eb9a661e087754 100644 (file)
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -1,8 +1,4 @@
-/* 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__) || defined (__DMC__)
+#if defined(_WIN32) || defined(__OS2__)

 #include "jconfig.vc"
 #else
 
 #include "jconfig.vc"
 #else
 


@@ -10,24 +6,7 @@
 /* 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 */
-#ifdef __MWERKS__
-#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
-    #define __WXMAC__
-               #define USE_MAC_MEMMGR
-       #ifdef __MACH__
-         #include <ansi_prefix.mach.h>
-         #include <msl_c_version.h>
-         #include <stdint.h>
-         #undef WCHAR_MAX
-         #include <machine/ansi.h>
-       #endif
-// automatically includes MacHeaders
-#elif (__MWERKS__ >= 0x0900) && __INTEL__
-    #define __WXMSW__
-#endif
-#endif
-
+/* use wxWidgets' configure */

 #include "wx/setup.h"
 
 #define HAVE_PROTOTYPES
 #include "wx/setup.h"
 
 #define HAVE_PROTOTYPES


@@ -36,7 +15,7 @@
 #undef void
 #undef const
 
 #undef void
 #undef const
 

-/* use wxWindows' configure */
+/* use wxWidgets' configure */

 /* #undef CHAR_IS_UNSIGNED */
 #ifdef __CHAR_UNSIGNED__
   #ifndef CHAR_IS_UNSIGNED
 /* #undef CHAR_IS_UNSIGNED */
 #ifdef __CHAR_UNSIGNED__
   #ifndef CHAR_IS_UNSIGNED


@@ -46,8 +25,14 @@
   #undef CHAR_IS_UNSIGNED
 #endif
 
   #undef CHAR_IS_UNSIGNED
 #endif
 

+#ifndef HAVE_STDDEF_H

 #define HAVE_STDDEF_H
 #define HAVE_STDDEF_H

+#endif
+
+#ifndef HAVE_STDLIB_H

 #define HAVE_STDLIB_H
 #define HAVE_STDLIB_H

+#endif
+

 #undef NEED_BSD_STRINGS
 #undef NEED_SYS_TYPES_H
 #undef NEED_FAR_POINTERS
 #undef NEED_BSD_STRINGS
 #undef NEED_SYS_TYPES_H
 #undef NEED_FAR_POINTERS


@@ -59,7 +44,7 @@
 
 #undef RIGHT_SHIFT_IS_UNSIGNED
 
 
 #undef RIGHT_SHIFT_IS_UNSIGNED
 

-/* use wxWindows' configure */
+/* use wxWidgets' configure */

 /* #define INLINE __inline__ */
 #if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
 #define INLINE
 /* #define INLINE __inline__ */
 #if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
 #define INLINE