]> git.saurik.com Git - wxWidgets.git/blame - src/jpeg/jconfig.h
Removed no longer needed code to fix combo sizing (causes layout problems on Windows)
[wxWidgets.git] / src / jpeg / jconfig.h
CommitLineData
ea64e17a
JS
1/* This test added by JACS as a quick fix. What should we do
2 * to make it work with configure?
3 */
4
38a87cfe 5#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__DMC__)
ea64e17a
JS
6#include "jconfig.vc"
7#else
8
67246ede
RR
9/* jconfig.h. Generated automatically by configure. */
10/* jconfig.cfg --- source file edited by configure script */
11/* see jconfig.doc for explanations */
12
61775761
DE
13/* If using MetroWerks on Mac define __WXMAC__ if it isn't already
14 FIXME: Is this necessary any longer? */
519cb848 15#ifdef __MWERKS__
84e7f94c 16#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
d0c57441
DS
17# ifndef __WXMAC__
18# define __WWXMAC__
19# endif
61775761
DE
20#endif
21#endif
22
23/* use wxWidgets' configure */
24#include "wx/setup.h"
25
5f8ba10e 26/* If using Metrowerks and not using configure-generated setup */
61775761
DE
27#if defined(__MWERKS__) && !defined(__WX_SETUP_H__)
28#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
d0c57441
DS
29
30# define USE_MAC_MEMMGR
31
32# ifdef __MACH__
33# include <ansi_prefix.mach.h>
34# include <msl_c_version.h>
35# include <stdint.h>
36# undef WCHAR_MAX
37# include <machine/ansi.h>
38# endif
39
5f8ba10e 40/* automatically includes MacHeaders */
519cb848
SC
41#elif (__MWERKS__ >= 0x0900) && __INTEL__
42 #define __WXMSW__
43#endif
44#endif
45
16a12a3d
DW
46#define HAVE_PROTOTYPES
47#define HAVE_UNSIGNED_CHAR
48#define HAVE_UNSIGNED_SHORT
67246ede
RR
49#undef void
50#undef const
d9f39e09 51
77ffb593 52/* use wxWidgets' configure */
d9f39e09
RR
53/* #undef CHAR_IS_UNSIGNED */
54#ifdef __CHAR_UNSIGNED__
55 #ifndef CHAR_IS_UNSIGNED
56 #define CHAR_IS_UNSIGNED
57 #endif
58#else
59 #undef CHAR_IS_UNSIGNED
60#endif
61
16a12a3d
DW
62#define HAVE_STDDEF_H
63#define HAVE_STDLIB_H
67246ede
RR
64#undef NEED_BSD_STRINGS
65#undef NEED_SYS_TYPES_H
66#undef NEED_FAR_POINTERS
67#undef NEED_SHORT_EXTERNAL_NAMES
68/* Define this if you get warnings about undefined structures. */
69#undef INCOMPLETE_TYPES_BROKEN
70
71#ifdef JPEG_INTERNALS
72
73#undef RIGHT_SHIFT_IS_UNSIGNED
d9f39e09 74
77ffb593 75/* use wxWidgets' configure */
d9f39e09 76/* #define INLINE __inline__ */
0dfef5a8
DW
77#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
78#define INLINE
f6bcfd97
BP
79#elif defined(__WATCOMC__)
80#define INLINE
0dfef5a8 81#else
d9f39e09 82#define INLINE inline
0dfef5a8 83#endif
d9f39e09 84
67246ede
RR
85/* These are for configuring the JPEG memory manager. */
86#undef DEFAULT_MAX_MEM
87#undef NO_MKTEMP
88
89#endif /* JPEG_INTERNALS */
90
91#ifdef JPEG_CJPEG_DJPEG
92
93#define BMP_SUPPORTED /* BMP image file format */
94#define GIF_SUPPORTED /* GIF image file format */
95#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
96#undef RLE_SUPPORTED /* Utah RLE image file format */
97#define TARGA_SUPPORTED /* Targa image file format */
98
99#undef TWO_FILE_COMMANDLINE
100#undef NEED_SIGNAL_CATCHER
101#undef DONT_USE_B_MODE
102
103/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
104#undef PROGRESS_REPORT
105
106#endif /* JPEG_CJPEG_DJPEG */
ea64e17a
JS
107#endif
108 /* _MSC_VER */
109