[hyperion] 42442: modified jmorecfg.h Arch Blackmann confuses compiler with build environment in libjpeg too. No project is safe modified libjpeg.rbuild HAVE_CONFIG_H is only used in ansi2knr.c, which we don't build added libjpeg.reactos.diff Added patch files with changes from vendor drop Yes, libjpeg now compiles with Visual C++, in case you were wondering

Author: hyperion
Date: Fri Aug  7 02:37:45 2009
New Revision: 42442

URL: http://svn.reactos.org/svn/reactos?rev=42442&view=rev
Log:
modified   jmorecfg.h
   Arch Blackmann confuses compiler with build environment in libjpeg too. No project is safe

modified   libjpeg.rbuild
   HAVE_CONFIG_H is only used in ansi2knr.c, which we don't build

added      libjpeg.reactos.diff
   Added patch files with changes from vendor drop

Yes, libjpeg now compiles with Visual C++, in case you were wondering

Added:
    trunk/reactos/dll/3rdparty/libjpeg/libjpeg.reactos.diff   (with props)
Modified:
    trunk/reactos/dll/3rdparty/libjpeg/jmorecfg.h
    trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild

Modified: trunk/reactos/dll/3rdparty/libjpeg/jmorecfg.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jmorec...
==============================================================================
--- trunk/reactos/dll/3rdparty/libjpeg/jmorecfg.h [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/libjpeg/jmorecfg.h [iso-8859-1] Fri Aug  7 02:37:45 2009
@@ -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 @@
 /* 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 */

Modified: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/libjpe...
==============================================================================
--- trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] Fri Aug  7 02:37:45 2009
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="libjpeg" type="win32dll" entrypoint="0" installbase="system32" installname="libjpeg.dll" allowwarnings="true" crt="msvcrt">
-	<define name="HAVE_CONFIG_H" />
    <define name="WIN32" />
    <define name="_WINDOWS" />
    <define name="_MBCS" />

Added: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.reactos.diff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/libjpe...
==============================================================================
--- trunk/reactos/dll/3rdparty/libjpeg/libjpeg.reactos.diff (added)
+++ trunk/reactos/dll/3rdparty/libjpeg/libjpeg.reactos.diff [iso-8859-1] Fri Aug  7 02:37:45 2009
@@ -1,0 +1,12 @@
+Index: jmorecfg.h
+===================================================================
+--- jmorecfg.h	(revision 42441)
++++ 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
+

Propchange: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.reactos.diff
------------------------------------------------------------------------------
    svn:eol-style = native