projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied patch #928786: "Fix memory leak produced by ConvertArgsToUnicode()"
[wxWidgets.git]
/
src
/
jpeg
/
jconfig.h
diff --git
a/src/jpeg/jconfig.h
b/src/jpeg/jconfig.h
index 42d94427c62561a862e823ad7e4c142269683143..3593170ff8dad56cddbb8f5a9c4ae145f7100da7 100644
(file)
--- a/
src/jpeg/jconfig.h
+++ b/
src/jpeg/jconfig.h
@@
-2,7
+2,7
@@
* to make it work with configure?
*/
* to make it work with configure?
*/
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
|| defined (__DMC__)
#include "jconfig.vc"
#else
#include "jconfig.vc"
#else
@@
-12,9
+12,16
@@
/* use wxWindows' configure */
#ifdef __MWERKS__
/* use wxWindows' configure */
#ifdef __MWERKS__
-#if (__MWERKS__ < 0x0900) || macintosh
+#if (__MWERKS__ < 0x0900) || macintosh
|| defined ( __MACH__ )
#define __WXMAC__
#define USE_MAC_MEMMGR
#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__
// automatically includes MacHeaders
#elif (__MWERKS__ >= 0x0900) && __INTEL__
#define __WXMSW__