cleanup of the "boolean" and "INT32" fixes for package jpeg

This commit is contained in:
Volker Grabsch 2010-04-21 13:42:44 +02:00
parent b9ee58881a
commit 99edab778a
3 changed files with 35 additions and 4 deletions

35
src/jpeg-win32.patch Normal file
View File

@ -0,0 +1,35 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
diff -r 13edd7b348d4 jmorecfg.h
--- a/jmorecfg.h Wed Apr 21 10:15:34 2010 +0200
+++ b/jmorecfg.h Wed Apr 21 11:36:07 2010 +0200
@@ -10,6 +10,16 @@
* JPEG software for special applications or support machine-dependent
* optimizations. Most users will not need to touch this file.
*/
+
+
+/*
+ * Load standard definitions on Windows systems to ensure that these
+ * are defined when _building_ as well as _using_ the library.
+ */
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
/*
@@ -233,7 +243,11 @@
*/
#ifndef HAVE_BOOLEAN
+#ifndef _RPCNDR_H_ /* Microsoft defines it in rpcndr.h */
+#ifndef _RPCNDR_H /* MinGW is slightly different */
typedef int boolean;
+#endif
+#endif
#endif
#ifndef FALSE /* in case these macros already exist */
#define FALSE 0 /* values of boolean */

View File

@ -19,8 +19,6 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# avoid redefinition of INT32
$(SED) -i 's,typedef long INT32;,#include <basetsd.h>,' '$(1)/jmorecfg.h'
cd '$(1)' && ./configure \
--prefix='$(PREFIX)/$(TARGET)' \
--host='$(TARGET)' \

View File

@ -19,8 +19,6 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# fix incompatibilities with jpeg
$(SED) -i 's,typedef unsigned char boolean;,,' '$(1)/include/rpcndr.h'
$(INSTALL) -d '$(PREFIX)/$(TARGET)'
cp -rpv '$(1)/include' '$(1)/lib' '$(PREFIX)/$(TARGET)'
endef