From 3bcb06c85c8d3f778cc10e4ca237abd78c5eaf5f Mon Sep 17 00:00:00 2001 From: "KJK::Hyperion" Date: Fri, 7 Aug 2009 02:24:46 +0000 Subject: [PATCH] See r42442. One of the affected files was duplicated, so we duplicate the fix svn path=/trunk/; revision=42452 --- reactos/include/reactos/libs/libjpeg/jmorecfg.h | 3 +-- .../reactos/libs/libjpeg/libjpeg.reactos.diff | 12 ++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 reactos/include/reactos/libs/libjpeg/libjpeg.reactos.diff diff --git a/reactos/include/reactos/libs/libjpeg/jmorecfg.h b/reactos/include/reactos/libs/libjpeg/jmorecfg.h index f54191b002e..41b329ef306 100644 --- a/reactos/include/reactos/libs/libjpeg/jmorecfg.h +++ b/reactos/include/reactos/libs/libjpeg/jmorecfg.h @@ -24,7 +24,6 @@ #if (defined (_MSC_VER) && (_MSC_VER >= 800)) #define HAVE_UNSIGNED_CHAR -#define HAVE_ALL_INTS #define EXTERN(type) extern type __cdecl #endif @@ -240,7 +239,7 @@ typedef unsigned int JDIMENSION; /* a function referenced thru EXTERNs: */ #define GLOBAL(type) type JPEG_API /* a reference to a GLOBAL function: */ -#ifndef EXTERN +#ifndef EXTERN # define EXTERN(type) extern JPEG_IMPEXP type JPEG_API /* a reference to a "GLOBAL" function exported by sourcefiles of utility progs */ #endif /* EXTERN */ diff --git a/reactos/include/reactos/libs/libjpeg/libjpeg.reactos.diff b/reactos/include/reactos/libs/libjpeg/libjpeg.reactos.diff new file mode 100644 index 00000000000..cf7be4ca39f --- /dev/null +++ b/reactos/include/reactos/libs/libjpeg/libjpeg.reactos.diff @@ -0,0 +1,12 @@ +Index: include/reactos/libs/libjpeg/jmorecfg.h +=================================================================== +--- include/reactos/libs/libjpeg/jmorecfg.h (revision 42441) ++++ include/reactos/libs/libjpeg/jmorecfg.h (working copy) +@@ -24,7 +24,6 @@ + + #if (defined (_MSC_VER) && (_MSC_VER >= 800)) + #define HAVE_UNSIGNED_CHAR +-#define HAVE_ALL_INTS + #define EXTERN(type) extern type __cdecl + #endif +