projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, restored the postpone-redraw-if-dirty test which was somehow left out
[wxWidgets.git]
/
src
/
jpeg
/
jconfig.h
diff --git
a/src/jpeg/jconfig.h
b/src/jpeg/jconfig.h
index 2bf765bb68e73b560ef53cb3afcb8da3eb1f972f..42d94427c62561a862e823ad7e4c142269683143 100644
(file)
--- a/
src/jpeg/jconfig.h
+++ b/
src/jpeg/jconfig.h
@@
-11,11
+11,21
@@
/* see jconfig.doc for explanations */
/* use wxWindows' configure */
/* see jconfig.doc for explanations */
/* use wxWindows' configure */
+#ifdef __MWERKS__
+#if (__MWERKS__ < 0x0900) || macintosh
+ #define __WXMAC__
+ #define USE_MAC_MEMMGR
+// automatically includes MacHeaders
+#elif (__MWERKS__ >= 0x0900) && __INTEL__
+ #define __WXMSW__
+#endif
+#endif
+
#include "wx/setup.h"
#include "wx/setup.h"
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
#undef void
#undef const
#undef void
#undef const
@@
-29,8
+39,8
@@
#undef CHAR_IS_UNSIGNED
#endif
#undef CHAR_IS_UNSIGNED
#endif
-#define HAVE_STDDEF_H
-#define HAVE_STDLIB_H
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
#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
@@
-44,7
+54,13
@@
/* use wxWindows' configure */
/* #define INLINE __inline__ */
/* use wxWindows' configure */
/* #define INLINE __inline__ */
+#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
+#define INLINE
+#elif defined(__WATCOMC__)
+#define INLINE
+#else
#define INLINE inline
#define INLINE inline
+#endif
/* These are for configuring the JPEG memory manager. */
#undef DEFAULT_MAX_MEM
/* These are for configuring the JPEG memory manager. */
#undef DEFAULT_MAX_MEM