[patch] This one seems to work for me.

devil-1.7.8-inline-define-conflict.patch (text/plain), 9.66 KB, created by Samuli Suominen (RETIRED) on 2012-01-26 12:56:28 UTC

diff -ur devil-1.7.8.orig/src-IL/include/il_internal.h devil-1.7.8/src-IL/include/il_internal.h
--- devil-1.7.8.orig/src-IL/include/il_internal.h	2009-03-08 09:10:08.000000000 +0200
+++ devil-1.7.8/src-IL/include/il_internal.h	2012-01-26 14:52:49.148543209 +0200
@@ -38,6 +38,7 @@
 #include <IL/devil_internal_exports.h>
 #include "il_files.h"
 #include "il_endian.h"
+#include "il_manip.h"
 
 #ifndef _WIN32
 	// The Microsoft HD Photo Device Porting Kit has not been ported to anything other
diff -ur devil-1.7.8.orig/src-IL/src/il_bmp.c devil-1.7.8/src-IL/src/il_bmp.c
--- devil-1.7.8.orig/src-IL/src/il_bmp.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_bmp.c	2012-01-26 14:52:40.724542957 +0200
@@ -15,7 +15,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_BMP
 #include "il_bmp.h"
-#include "il_manip.h"
 #include "il_endian.h"
 #include <stdio.h>
 void GetShiftFromMask(const ILuint Mask, ILuint * CONST_RESTRICT ShiftLeft, ILuint * CONST_RESTRICT ShiftRight);
diff -ur devil-1.7.8.orig/src-IL/src/il_convbuff.c devil-1.7.8/src-IL/src/il_convbuff.c
--- devil-1.7.8.orig/src-IL/src/il_convbuff.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_convbuff.c	2012-01-26 14:52:40.731542957 +0200
@@ -12,7 +12,6 @@
 
 
 #include "il_internal.h"
-#include "il_manip.h"
 #ifdef ALTIVEC_GCC
 #include "altivec_typeconversion.h"
 #endif
diff -ur devil-1.7.8.orig/src-IL/src/il_convert.c devil-1.7.8/src-IL/src/il_convert.c
--- devil-1.7.8.orig/src-IL/src/il_convert.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_convert.c	2012-01-26 14:52:40.726542957 +0200
@@ -12,7 +12,6 @@
 
 
 #include "il_internal.h"
-#include "il_manip.h"
 #include <limits.h>
 
 
diff -ur devil-1.7.8.orig/src-IL/src/il_cut.c devil-1.7.8/src-IL/src/il_cut.c
--- devil-1.7.8.orig/src-IL/src/il_cut.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_cut.c	2012-01-26 14:52:40.704542956 +0200
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_CUT
-#include "il_manip.h"
 #include "il_pal.h"
 #include "il_bits.h"
 
diff -ur devil-1.7.8.orig/src-IL/src/il_dcx.c devil-1.7.8/src-IL/src/il_dcx.c
--- devil-1.7.8.orig/src-IL/src/il_dcx.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_dcx.c	2012-01-26 14:52:40.683542956 +0200
@@ -14,7 +14,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_DCX
 #include "il_dcx.h"
-#include "il_manip.h"
 
 
 //! Checks if the file specified in FileName is a valid .dcx file.
diff -ur devil-1.7.8.orig/src-IL/src/il_dds-save.c devil-1.7.8/src-IL/src/il_dds-save.c
--- devil-1.7.8.orig/src-IL/src/il_dds-save.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_dds-save.c	2012-01-26 14:52:40.721542957 +0200
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #include "il_dds.h"
-#include "il_manip.h"
 #include <limits.h>
 
 
diff -ur devil-1.7.8.orig/src-IL/src/il_devil.c devil-1.7.8/src-IL/src/il_devil.c
--- devil-1.7.8.orig/src-IL/src/il_devil.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_devil.c	2012-01-26 14:52:40.741542958 +0200
@@ -14,7 +14,6 @@
 #include "il_internal.h"
 #include <string.h>
 #include <limits.h>
-#include "il_manip.h"
 
 
 ILAPI ILboolean ILAPIENTRY ilInitImage(ILimage *Image, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, void *Data)
diff -ur devil-1.7.8.orig/src-IL/src/il_doom.c devil-1.7.8/src-IL/src/il_doom.c
--- devil-1.7.8.orig/src-IL/src/il_doom.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_doom.c	2012-01-26 14:52:40.722542957 +0200
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_DOOM
-#include "il_manip.h"
 #include "il_pal.h"
 #include "il_doompal.h"
 
diff -ur devil-1.7.8.orig/src-IL/src/il_jpeg.c devil-1.7.8/src-IL/src/il_jpeg.c
--- devil-1.7.8.orig/src-IL/src/il_jpeg.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_jpeg.c	2012-01-26 14:52:40.752542958 +0200
@@ -44,7 +44,6 @@
 	#endif
 
 #include "il_jpeg.h"
-#include "il_manip.h"
 #include <setjmp.h>
 
 
diff -ur devil-1.7.8.orig/src-IL/src/il_manip.c devil-1.7.8/src-IL/src/il_manip.c
--- devil-1.7.8.orig/src-IL/src/il_manip.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_manip.c	2012-01-26 14:52:40.733542957 +0200
@@ -11,7 +11,6 @@
 //-----------------------------------------------------------------------------
 
 #include "il_internal.h"
-#include "il_manip.h"
 
 
 ILAPI void ILAPIENTRY iFlipBuffer(ILubyte *buff, ILuint depth, ILuint line_size, ILuint line_num)
diff -ur devil-1.7.8.orig/src-IL/src/il_nvidia.cpp devil-1.7.8/src-IL/src/il_nvidia.cpp
--- devil-1.7.8.orig/src-IL/src/il_nvidia.cpp	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_nvidia.cpp	2012-01-26 14:52:40.731542957 +0200
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #include "il_dds.h"
-#include "il_manip.h"
 #include <limits.h>
 
 
diff -ur devil-1.7.8.orig/src-IL/src/il_pcd.c devil-1.7.8/src-IL/src/il_pcd.c
--- devil-1.7.8.orig/src-IL/src/il_pcd.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_pcd.c	2012-01-26 14:52:40.757542958 +0200
@@ -15,7 +15,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_PCD
-#include "il_manip.h"
 
 
 ILboolean iLoadPcdInternal(void);
diff -ur devil-1.7.8.orig/src-IL/src/il_pcx.c devil-1.7.8/src-IL/src/il_pcx.c
--- devil-1.7.8.orig/src-IL/src/il_pcx.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_pcx.c	2012-01-26 14:52:40.737542957 +0200
@@ -14,7 +14,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_PCX
 #include "il_pcx.h"
-#include "il_manip.h"
 
 
 //! Checks if the file specified in FileName is a valid .pcx file.
diff -ur devil-1.7.8.orig/src-IL/src/il_pic.c devil-1.7.8/src-IL/src/il_pic.c
--- devil-1.7.8.orig/src-IL/src/il_pic.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_pic.c	2012-01-26 14:52:40.698542956 +0200
@@ -15,7 +15,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_PIC
 #include "il_pic.h"
-#include "il_manip.h"
 #include <string.h>
 
 
diff -ur devil-1.7.8.orig/src-IL/src/il_pix.c devil-1.7.8/src-IL/src/il_pix.c
--- devil-1.7.8.orig/src-IL/src/il_pix.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_pix.c	2012-01-26 14:52:40.703542956 +0200
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_PIX
-#include "il_manip.h"
 #include "il_endian.h"
 
 
diff -ur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c
--- devil-1.7.8.orig/src-IL/src/il_png.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_png.c	2012-01-26 14:52:40.755542958 +0200
@@ -19,7 +19,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_PNG
 #include <png.h>
-#include "il_manip.h"
 #include <stdlib.h>
 #if PNG_LIBPNG_VER < 10200
 	#warning DevIL was designed with libpng 1.2.0 or higher in mind.  Consider upgrading at www.libpng.org.
diff -ur devil-1.7.8.orig/src-IL/src/il_pnm.c devil-1.7.8/src-IL/src/il_pnm.c
--- devil-1.7.8.orig/src-IL/src/il_pnm.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_pnm.c	2012-01-26 14:52:40.757542958 +0200
@@ -17,7 +17,6 @@
 #include "il_pnm.h"
 #include <limits.h>  // for maximum values
 #include <ctype.h>
-#include "il_manip.h"
 #include "il_bits.h"
 
 // According to the ppm specs, it's 70, but PSP
diff -ur devil-1.7.8.orig/src-IL/src/il_pxr.c devil-1.7.8/src-IL/src/il_pxr.c
--- devil-1.7.8.orig/src-IL/src/il_pxr.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_pxr.c	2012-01-26 14:52:40.721542957 +0200
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_PXR
-#include "il_manip.h"
 #include "il_endian.h"
 
 
diff -ur devil-1.7.8.orig/src-IL/src/il_rawdata.c devil-1.7.8/src-IL/src/il_rawdata.c
--- devil-1.7.8.orig/src-IL/src/il_rawdata.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_rawdata.c	2012-01-26 14:52:40.700542956 +0200
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 //#ifndef IL_NO_DATA
-#include "il_manip.h"
 
 
 ILboolean iLoadDataInternal(ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
diff -ur devil-1.7.8.orig/src-IL/src/il_sgi.c devil-1.7.8/src-IL/src/il_sgi.c
--- devil-1.7.8.orig/src-IL/src/il_sgi.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_sgi.c	2012-01-26 14:52:40.682542956 +0200
@@ -13,7 +13,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_SGI
 #include "il_sgi.h"
-#include "il_manip.h"
 #include <limits.h>
 
 static char *FName = NULL;
diff -ur devil-1.7.8.orig/src-IL/src/il_squish.cpp devil-1.7.8/src-IL/src/il_squish.cpp
--- devil-1.7.8.orig/src-IL/src/il_squish.cpp	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_squish.cpp	2012-01-26 14:52:40.745542958 +0200
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 /*#include "il_dds.h"
-#include "il_manip.h"
 #include <limits.h>*/
 
 
diff -ur devil-1.7.8.orig/src-IL/src/il_targa.c devil-1.7.8/src-IL/src/il_targa.c
--- devil-1.7.8.orig/src-IL/src/il_targa.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_targa.c	2012-01-26 14:52:40.690542956 +0200
@@ -16,7 +16,6 @@
 #include "il_targa.h"
 //#include <time.h>  // for ilMakeString()
 #include <string.h>
-#include "il_manip.h"
 #include "il_bits.h"
 
 #ifdef DJGPP
diff -ur devil-1.7.8.orig/src-IL/src/il_tiff.c devil-1.7.8/src-IL/src/il_tiff.c
--- devil-1.7.8.orig/src-IL/src/il_tiff.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_tiff.c	2012-01-26 14:52:40.692542956 +0200
@@ -17,7 +17,6 @@
 #include "tiffio.h"
 
 #include <time.h>
-#include "il_manip.h"
 
 #define MAGIC_HEADER1	0x4949
 #define MAGIC_HEADER2	0x4D4D
diff -ur devil-1.7.8.orig/src-IL/src/il_wal.c devil-1.7.8/src-IL/src/il_wal.c
--- devil-1.7.8.orig/src-IL/src/il_wal.c	2009-03-08 09:10:09.000000000 +0200
+++ devil-1.7.8/src-IL/src/il_wal.c	2012-01-26 14:52:40.691542956 +0200
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_WAL
-#include "il_manip.h"
 #include "il_q2pal.h"