See r42442. One of the affected files was duplicated, so we duplicate the fix

svn path=/trunk/; revision=42452
This commit is contained in:
KJK::Hyperion 2009-08-07 02:24:46 +00:00
parent 6046aeca98
commit 3bcb06c85c
2 changed files with 13 additions and 2 deletions

View file

@ -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 */

View file

@ -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