X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67246edee2f3e840c64921c5d833c29823398bb3..5fa399c9e241e99132733b09673cbcb76c9f77e1:/src/jpeg/jconfig.h diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h index 9594ec56bb..e3c94a1717 100644 --- a/src/jpeg/jconfig.h +++ b/src/jpeg/jconfig.h @@ -1,15 +1,46 @@ +/* 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 */ -#define HAVE_PROTOTYPES -#define HAVE_UNSIGNED_CHAR -#define HAVE_UNSIGNED_SHORT +/* 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" + +#define HAVE_PROTOTYPES +#define HAVE_UNSIGNED_CHAR +#define HAVE_UNSIGNED_SHORT #undef void #undef const -#undef CHAR_IS_UNSIGNED -#define HAVE_STDDEF_H -#define HAVE_STDLIB_H + +/* 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 #undef NEED_SYS_TYPES_H #undef NEED_FAR_POINTERS @@ -20,7 +51,15 @@ #ifdef JPEG_INTERNALS #undef RIGHT_SHIFT_IS_UNSIGNED -#define INLINE __inline__ + +/* use wxWindows' configure */ +/* #define INLINE __inline__ */ +#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400) +#define INLINE +#else +#define INLINE inline +#endif + /* These are for configuring the JPEG memory manager. */ #undef DEFAULT_MAX_MEM #undef NO_MKTEMP @@ -43,3 +82,6 @@ #undef PROGRESS_REPORT #endif /* JPEG_CJPEG_DJPEG */ +#endif + /* _MSC_VER */ +