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

svn path=/trunk/; revision=42442
This commit is contained in:
KJK::Hyperion 2009-08-07 00:37:45 +00:00
parent 6c2f42c953
commit 83e0a3e605
3 changed files with 13 additions and 3 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

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

View file

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