0c4f9b739f
Upgrade submodule sources to the latest upstream release and revert all our local modifications, except for the addition of jconfig.h, as they don't seem to be necessary any longer.
89 lines
2.0 KiB
C
89 lines
2.0 KiB
C
#if defined(_WIN32)
|
|
#include "jconfig.vc"
|
|
#else
|
|
|
|
/* jconfig.cfg --- source file edited by configure script */
|
|
/* see jconfig.txt for explanations */
|
|
|
|
/* use wxWidgets' configure */
|
|
#include "wx/setup.h"
|
|
|
|
#define HAVE_PROTOTYPES
|
|
#define HAVE_UNSIGNED_CHAR
|
|
#define HAVE_UNSIGNED_SHORT
|
|
#undef void
|
|
#undef const
|
|
|
|
/* use wxWidgets' configure */
|
|
/* #undef CHAR_IS_UNSIGNED */
|
|
#ifdef __CHAR_UNSIGNED__
|
|
#ifndef CHAR_IS_UNSIGNED
|
|
#define CHAR_IS_UNSIGNED
|
|
#endif
|
|
#else
|
|
#undef CHAR_IS_UNSIGNED
|
|
#endif
|
|
|
|
#ifndef HAVE_STDDEF_H
|
|
#define HAVE_STDDEF_H
|
|
#endif
|
|
|
|
#ifndef HAVE_STDLIB_H
|
|
#define HAVE_STDLIB_H
|
|
#endif
|
|
|
|
#ifndef HAVE_LOCALE_H
|
|
#define HAVE_LOCALE_H
|
|
#endif
|
|
|
|
#undef NEED_BSD_STRINGS
|
|
#undef NEED_SYS_TYPES_H
|
|
#undef NEED_FAR_POINTERS
|
|
#undef NEED_SHORT_EXTERNAL_NAMES
|
|
/* Define this if you get warnings about undefined structures. */
|
|
#undef INCOMPLETE_TYPES_BROKEN
|
|
|
|
/* Define "boolean" as unsigned char, not enum, on Windows systems. */
|
|
#ifdef _WIN32
|
|
#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
|
|
typedef unsigned char boolean;
|
|
#endif
|
|
#ifndef FALSE /* in case these macros already exist */
|
|
#define FALSE 0 /* values of boolean */
|
|
#endif
|
|
#ifndef TRUE
|
|
#define TRUE 1
|
|
#endif
|
|
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
|
|
#endif
|
|
|
|
#ifdef JPEG_INTERNALS
|
|
|
|
#undef RIGHT_SHIFT_IS_UNSIGNED
|
|
#undef INLINE
|
|
/* These are for configuring the JPEG memory manager. */
|
|
#undef DEFAULT_MAX_MEM
|
|
#undef NO_MKTEMP
|
|
|
|
#endif /* JPEG_INTERNALS */
|
|
|
|
#ifdef JPEG_CJPEG_DJPEG
|
|
|
|
#define BMP_SUPPORTED /* BMP image file format */
|
|
#define GIF_SUPPORTED /* GIF image file format */
|
|
#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
|
|
#undef RLE_SUPPORTED /* Utah RLE image file format */
|
|
#define TARGA_SUPPORTED /* Targa image file format */
|
|
|
|
#undef TWO_FILE_COMMANDLINE
|
|
#undef NEED_SIGNAL_CATCHER
|
|
#undef DONT_USE_B_MODE
|
|
|
|
/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
|
|
#undef PROGRESS_REPORT
|
|
|
|
#endif /* JPEG_CJPEG_DJPEG */
|
|
#endif
|
|
/* _MSC_VER */
|
|
|