Mercurial > mxe-octave
view src/jpeg-win32.patch @ 918:f90a81004e90
improved patch for package jpeg
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Tue, 27 Apr 2010 18:38:53 +0200 |
parents | 5e1d76c5caf9 |
children |
line wrap: on
line source
This file is part of mingw-cross-env. See doc/index.html for further information. diff -r fcac1fe04220 jconfig.cfg --- a/jconfig.cfg Sun Apr 25 11:28:20 2010 +0200 +++ b/jconfig.cfg Mon Apr 26 11:32:32 2010 +0200 @@ -16,6 +16,14 @@ #undef NEED_SHORT_EXTERNAL_NAMES /* Define this if you get warnings about undefined structures. */ #undef INCOMPLETE_TYPES_BROKEN + +/* Define "boolean" as unsigned char, not int, on Windows systems. */ +#ifdef _WIN32 +#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ +typedef unsigned char boolean; +#endif +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ +#endif #ifdef JPEG_INTERNALS diff -r fcac1fe04220 jconfig.txt --- a/jconfig.txt Sun Apr 25 11:28:20 2010 +0200 +++ b/jconfig.txt Mon Apr 26 11:32:32 2010 +0200 @@ -91,6 +91,15 @@ */ #undef INCOMPLETE_TYPES_BROKEN +/* Define "boolean" as unsigned char, not int, on Windows systems. + */ +#ifdef _WIN32 +#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ +typedef unsigned char boolean; +#endif +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ +#endif + /* * The following options affect code selection within the JPEG library,