diff options
Diffstat (limited to 'code/jpeg-6')
| -rw-r--r-- | code/jpeg-6/jinclude.h | 2 | ||||
| -rw-r--r-- | code/jpeg-6/jmorecfg.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/code/jpeg-6/jinclude.h b/code/jpeg-6/jinclude.h index eadcd19..aede8ec 100644 --- a/code/jpeg-6/jinclude.h +++ b/code/jpeg-6/jinclude.h @@ -15,7 +15,7 @@ */ -#ifdef _WIN32 +#ifdef _MSC_VER #pragma warning(disable : 4018) // signed/unsigned mismatch #pragma warning(disable : 4032) diff --git a/code/jpeg-6/jmorecfg.h b/code/jpeg-6/jmorecfg.h index 1fc0a19..a2fea83 100644 --- a/code/jpeg-6/jmorecfg.h +++ b/code/jpeg-6/jmorecfg.h @@ -149,7 +149,9 @@ typedef unsigned short UINT16; typedef unsigned int UINT16; #endif /* HAVE_UNSIGNED_SHORT */ +#ifndef DONT_TYPEDEF_INT32 typedef long INT32; +#endif /* INT16 must hold at least the values -32768..32767. */ |