Mercurial > mxe-octave

comparison src/jpeg-win32.patch @ 918:f90a81004e90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved patch for package jpeg
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 27 Apr 2010 18:38:53 +0200
parents 5e1d76c5caf9
children
comparison
equal deleted inserted replaced
917:05f38762e065 918:f90a81004e90
1 This file is part of mingw-cross-env. 1 This file is part of mingw-cross-env.
2 See doc/index.html for further information. 2 See doc/index.html for further information.
3 3
4 diff -r 13edd7b348d4 jmorecfg.h 4 diff -r fcac1fe04220 jconfig.cfg
5 --- a/jmorecfg.h Wed Apr 21 10:15:34 2010 +0200 5 --- a/jconfig.cfg Sun Apr 25 11:28:20 2010 +0200
6 +++ b/jmorecfg.h Wed Apr 21 11:36:07 2010 +0200 6 +++ b/jconfig.cfg Mon Apr 26 11:32:32 2010 +0200
7 @@ -10,6 +10,16 @@ 7 @@ -16,6 +16,14 @@
8 * JPEG software for special applications or support machine-dependent 8 #undef NEED_SHORT_EXTERNAL_NAMES
9 * optimizations. Most users will not need to touch this file. 9 /* Define this if you get warnings about undefined structures. */
10 */ 10 #undef INCOMPLETE_TYPES_BROKEN
11 + 11 +
12 + 12 +/* Define "boolean" as unsigned char, not int, on Windows systems. */
13 +/*
14 + * Load standard definitions on Windows systems to ensure that these
15 + * are defined when _building_ as well as _using_ the library.
16 + */
17 +
18 +#ifdef _WIN32 13 +#ifdef _WIN32
19 +#include <windows.h> 14 +#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
15 +typedef unsigned char boolean;
16 +#endif
17 +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
20 +#endif 18 +#endif
21 19
20 #ifdef JPEG_INTERNALS
21
22 diff -r fcac1fe04220 jconfig.txt
23 --- a/jconfig.txt Sun Apr 25 11:28:20 2010 +0200
24 +++ b/jconfig.txt Mon Apr 26 11:32:32 2010 +0200
25 @@ -91,6 +91,15 @@
26 */
27 #undef INCOMPLETE_TYPES_BROKEN
28
29 +/* Define "boolean" as unsigned char, not int, on Windows systems.
30 + */
31 +#ifdef _WIN32
32 +#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
33 +typedef unsigned char boolean;
34 +#endif
35 +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
36 +#endif
37 +
22 38
23 /* 39 /*
24 @@ -233,7 +243,11 @@ 40 * The following options affect code selection within the JPEG library,
25 */
26
27 #ifndef HAVE_BOOLEAN
28 +#ifndef _RPCNDR_H_ /* Microsoft defines it in rpcndr.h */
29 +#ifndef _RPCNDR_H /* MinGW is slightly different */
30 typedef int boolean;
31 +#endif
32 +#endif
33 #endif
34 #ifndef FALSE /* in case these macros already exist */
35 #define FALSE 0 /* values of boolean */