Avoid g++ warnings about breaking strict aliasing rules in wxTreeCtrl.

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

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index 7b26b7feae952a5e401692a25801f578a075aea6..bd5f5db9fa5d1a9828413e804563bb8c41c0851e 100644 (file)
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -1,4 +1,4 @@
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__OS2__)
 #include "jconfig.vc"
 #else
 
@@ -11,7 +11,7 @@
 #ifdef __MWERKS__
 #if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
 #   ifndef __WXMAC__
-#       define __WWXMAC__
+#       define __WXMAC__
 #   endif
 #endif
 #endif
@@ -55,8 +55,14 @@
   #undef CHAR_IS_UNSIGNED
 #endif
 
+#ifndef HAVE_STDDEF_H
 #define HAVE_STDDEF_H
+#endif
+
+#ifndef HAVE_STDLIB_H
 #define HAVE_STDLIB_H
+#endif
+
 #undef NEED_BSD_STRINGS
 #undef NEED_SYS_TYPES_H
 #undef NEED_FAR_POINTERS