devil-dev/devil_gcc4.3.patch

   1 diff -ru DevIL-1.6.8/include/IL/il.h DevIL-1.6.8-gcc4.1/include/IL/il.h
   2 --- DevIL-1.6.8/include/IL/il.h 2006-08-10 15:20:10.000000000 +0200
   3 +++ DevIL-1.6.8-gcc4.1/include/IL/il.h  2008-07-02 09:39:40.000000000 +0200
   4 @@ -445,15 +445,15 @@
   5  ILAPI ILvoid    ILAPIENTRY ilBindImage(ILuint Image);
   6  ILAPI ILboolean ILAPIENTRY ilBlit(ILuint Source, ILint DestX, ILint DestY, ILint DestZ, ILuint SrcX, ILuint SrcY, ILuint SrcZ, ILuint Width, ILuint Height, ILuint Depth);
   7  ILAPI ILvoid    ILAPIENTRY ilClearColour(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
   8 -ILAPI ILboolean ILAPIENTRY ilClearImage(ILvoid);
   9 -ILAPI ILuint    ILAPIENTRY ilCloneCurImage(ILvoid);
  10 +ILAPI ILboolean ILAPIENTRY ilClearImage(void);
  11 +ILAPI ILuint    ILAPIENTRY ilCloneCurImage(void);
  12  ILAPI ILboolean ILAPIENTRY ilCompressFunc(ILenum Mode);
  13  ILAPI ILboolean ILAPIENTRY ilConvertImage(ILenum DestFormat, ILenum DestType);
  14  ILAPI ILboolean ILAPIENTRY ilConvertPal(ILenum DestFormat);
  15  ILAPI ILboolean ILAPIENTRY ilCopyImage(ILuint Src);
  16 -ILAPI ILuint    ILAPIENTRY ilCopyPixels(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data);
  17 +ILAPI ILuint    ILAPIENTRY ilCopyPixels(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, void *Data);
  18  ILAPI ILuint    ILAPIENTRY ilCreateSubImage(ILenum Type, ILuint Num);
  19 -ILAPI ILboolean ILAPIENTRY ilDefaultImage(ILvoid);
  20 +ILAPI ILboolean ILAPIENTRY ilDefaultImage(void);
  21  ILAPI ILvoid    ILAPIENTRY ilDeleteImage(const ILuint Num);
  22  ILAPI ILvoid    ILAPIENTRY ilDeleteImages(ILsizei Num, const ILuint *Images);
  23  ILAPI ILboolean ILAPIENTRY ilDisable(ILenum Mode);
  24 @@ -464,71 +464,71 @@
  25  ILAPI ILubyte*  ILAPIENTRY ilGetAlpha(ILenum Type);
  26  ILAPI ILboolean ILAPIENTRY ilGetBoolean(ILenum Mode);
  27  ILAPI ILvoid    ILAPIENTRY ilGetBooleanv(ILenum Mode, ILboolean *Param);
  28 -ILAPI ILubyte*  ILAPIENTRY ilGetData(ILvoid);
  29 -ILAPI ILuint    ILAPIENTRY ilGetDXTCData(ILvoid *Buffer, ILuint BufferSize, ILenum DXTCFormat);
  30 -ILAPI ILenum    ILAPIENTRY ilGetError(ILvoid);
  31 +ILAPI ILubyte*  ILAPIENTRY ilGetData(void);
  32 +ILAPI ILuint    ILAPIENTRY ilGetDXTCData(void *Buffer, ILuint BufferSize, ILenum DXTCFormat);
  33 +ILAPI ILenum    ILAPIENTRY ilGetError(void);
  34  ILAPI ILint     ILAPIENTRY ilGetInteger(ILenum Mode);
  35  ILAPI ILvoid    ILAPIENTRY ilGetIntegerv(ILenum Mode, ILint *Param);
  36 -ILAPI ILuint    ILAPIENTRY ilGetLumpPos(ILvoid);
  37 -ILAPI ILubyte*  ILAPIENTRY ilGetPalette(ILvoid);
  38 +ILAPI ILuint    ILAPIENTRY ilGetLumpPos(void);
  39 +ILAPI ILubyte*  ILAPIENTRY ilGetPalette(void);
  40  ILAPI ILstring  ILAPIENTRY ilGetString(ILenum StringName);
  41  ILAPI ILvoid    ILAPIENTRY ilHint(ILenum Target, ILenum Mode);
  42 -ILAPI ILvoid    ILAPIENTRY ilInit(ILvoid);
  43 +ILAPI ILvoid    ILAPIENTRY ilInit(void);
  44  ILAPI ILboolean ILAPIENTRY ilIsDisabled(ILenum Mode);
  45  ILAPI ILboolean ILAPIENTRY ilIsEnabled(ILenum Mode);
  46  ILAPI ILboolean ILAPIENTRY ilIsImage(ILuint Image);
  47  ILAPI ILboolean ILAPIENTRY ilIsValid(ILenum Type, ILstring FileName);
  48  ILAPI ILboolean ILAPIENTRY ilIsValidF(ILenum Type, ILHANDLE File);
  49 -ILAPI ILboolean ILAPIENTRY ilIsValidL(ILenum Type, ILvoid *Lump, ILuint Size);
  50 +ILAPI ILboolean ILAPIENTRY ilIsValidL(ILenum Type, void *Lump, ILuint Size);
  51  ILAPI ILvoid    ILAPIENTRY ilKeyColour(ILclampf Red, ILclampf Green, ILclampf Blue, ILclampf Alpha);
  52  ILAPI ILboolean ILAPIENTRY ilLoad(ILenum Type, const ILstring FileName);
  53  ILAPI ILboolean ILAPIENTRY ilLoadF(ILenum Type, ILHANDLE File);
  54  ILAPI ILboolean ILAPIENTRY ilLoadImage(const ILstring FileName);
  55 -ILAPI ILboolean ILAPIENTRY ilLoadL(ILenum Type, const ILvoid *Lump, ILuint Size);
  56 +ILAPI ILboolean ILAPIENTRY ilLoadL(ILenum Type, const void *Lump, ILuint Size);
  57  ILAPI ILboolean ILAPIENTRY ilLoadPal(const ILstring FileName);
  58  ILAPI ILvoid    ILAPIENTRY ilModAlpha( ILdouble AlphaValue );
  59  ILAPI ILboolean ILAPIENTRY ilOriginFunc(ILenum Mode);
  60  ILAPI ILboolean ILAPIENTRY ilOverlayImage(ILuint Source, ILint XCoord, ILint YCoord, ILint ZCoord);
  61 -ILAPI ILvoid    ILAPIENTRY ilPopAttrib(ILvoid);
  62 +ILAPI ILvoid    ILAPIENTRY ilPopAttrib(void);
  63  ILAPI ILvoid    ILAPIENTRY ilPushAttrib(ILuint Bits);
  64  ILAPI ILvoid    ILAPIENTRY ilRegisterFormat(ILenum Format);
  65  ILAPI ILboolean ILAPIENTRY ilRegisterLoad(const ILstring Ext, IL_LOADPROC Load);
  66  ILAPI ILboolean ILAPIENTRY ilRegisterMipNum(ILuint Num);
  67  ILAPI ILboolean ILAPIENTRY ilRegisterNumImages(ILuint Num);
  68  ILAPI ILvoid    ILAPIENTRY ilRegisterOrigin(ILenum Origin);
  69 -ILAPI ILvoid    ILAPIENTRY ilRegisterPal(ILvoid *Pal, ILuint Size, ILenum Type);
  70 +ILAPI ILvoid    ILAPIENTRY ilRegisterPal(void *Pal, ILuint Size, ILenum Type);
  71  ILAPI ILboolean ILAPIENTRY ilRegisterSave(const ILstring Ext, IL_SAVEPROC Save);
  72  ILAPI ILvoid    ILAPIENTRY ilRegisterType(ILenum Type);
  73  ILAPI ILboolean ILAPIENTRY ilRemoveLoad(const ILstring Ext);
  74  ILAPI ILboolean ILAPIENTRY ilRemoveSave(const ILstring Ext);
  75 -ILAPI ILvoid    ILAPIENTRY ilResetMemory(ILvoid);
  76 -ILAPI ILvoid    ILAPIENTRY ilResetRead(ILvoid);
  77 -ILAPI ILvoid    ILAPIENTRY ilResetWrite(ILvoid);
  78 +ILAPI ILvoid    ILAPIENTRY ilResetMemory(void);
  79 +ILAPI ILvoid    ILAPIENTRY ilResetRead(void);
  80 +ILAPI ILvoid    ILAPIENTRY ilResetWrite(void);
  81  ILAPI ILboolean ILAPIENTRY ilSave(ILenum Type, ILstring FileName);
  82  ILAPI ILuint    ILAPIENTRY ilSaveF(ILenum Type, ILHANDLE File);
  83  ILAPI ILboolean ILAPIENTRY ilSaveImage(const ILstring FileName);
  84 -ILAPI ILuint    ILAPIENTRY ilSaveL(ILenum Type, ILvoid *Lump, ILuint Size);
  85 +ILAPI ILuint    ILAPIENTRY ilSaveL(ILenum Type, void *Lump, ILuint Size);
  86  ILAPI ILboolean ILAPIENTRY ilSavePal(const ILstring FileName);
  87  ILAPI ILvoid    ILAPIENTRY ilSetAlpha( ILdouble AlphaValue );
  88 -ILAPI ILboolean ILAPIENTRY ilSetData(ILvoid *Data);
  89 +ILAPI ILboolean ILAPIENTRY ilSetData(void *Data);
  90  ILAPI ILboolean ILAPIENTRY ilSetDuration(ILuint Duration);
  91  ILAPI ILvoid    ILAPIENTRY ilSetInteger(ILenum Mode, ILint Param);
  92  ILAPI ILvoid    ILAPIENTRY ilSetMemory(mAlloc, mFree);
  93 -ILAPI ILvoid    ILAPIENTRY ilSetPixels(ILint XOff, ILint YOff, ILint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, ILvoid *Data);
  94 +ILAPI ILvoid    ILAPIENTRY ilSetPixels(ILint XOff, ILint YOff, ILint ZOff, ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, void *Data);
  95  ILAPI ILvoid    ILAPIENTRY ilSetRead(fOpenRProc, fCloseRProc, fEofProc, fGetcProc, fReadProc, fSeekRProc, fTellRProc);
  96  ILAPI ILvoid    ILAPIENTRY ilSetString(ILenum Mode, const char *String);
  97  ILAPI ILvoid    ILAPIENTRY ilSetWrite(fOpenWProc, fCloseWProc, fPutcProc, fSeekWProc, fTellWProc, fWriteProc);
  98 -ILAPI ILvoid    ILAPIENTRY ilShutDown(ILvoid);
  99 -ILAPI ILboolean ILAPIENTRY ilTexImage(ILuint Width, ILuint Height, ILuint Depth, ILubyte numChannels, ILenum Format, ILenum Type, ILvoid *Data);
 100 +ILAPI ILvoid    ILAPIENTRY ilShutDown(void);
 101 +ILAPI ILboolean ILAPIENTRY ilTexImage(ILuint Width, ILuint Height, ILuint Depth, ILubyte numChannels, ILenum Format, ILenum Type, void *Data);
 102  ILAPI ILenum    ILAPIENTRY ilTypeFromExt(const ILstring FileName);
 103  ILAPI ILboolean ILAPIENTRY ilTypeFunc(ILenum Mode);
 104  ILAPI ILboolean ILAPIENTRY ilLoadData(const ILstring FileName, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
 105  ILAPI ILboolean ILAPIENTRY ilLoadDataF(ILHANDLE File, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
 106 -ILAPI ILboolean ILAPIENTRY ilLoadDataL(ILvoid *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
 107 +ILAPI ILboolean ILAPIENTRY ilLoadDataL(void *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
 108  ILAPI ILboolean ILAPIENTRY ilSaveData(const ILstring FileName);
 109
 110 -ILAPI ILboolean ILAPIENTRY ilLoadFromJpegStruct(ILvoid* JpegDecompressorPtr);
 111 -ILAPI ILboolean ILAPIENTRY ilSaveFromJpegStruct(ILvoid* JpegCompressorPtr);
 112 +ILAPI ILboolean ILAPIENTRY ilLoadFromJpegStruct(void* JpegDecompressorPtr);
 113 +ILAPI ILboolean ILAPIENTRY ilSaveFromJpegStruct(void* JpegCompressorPtr);
 114
 115  // For all those weirdos that spell "colour" without the 'u'.
 116  #define ilClearColor   ilClearColour
 117 diff -ru DevIL-1.6.8/include/IL/ilu.h DevIL-1.6.8-gcc4.1/include/IL/ilu.h
 118 --- DevIL-1.6.8/include/IL/ilu.h        2006-08-16 11:18:21.000000000 +0200
 119 +++ DevIL-1.6.8-gcc4.1/include/IL/ilu.h 2008-07-02 09:35:47.000000000 +0200
 120 @@ -122,37 +122,37 @@
 121
 122
 123  // ImageLib Utility Functions
 124 -ILAPI ILboolean      ILAPIENTRY iluAlienify(ILvoid);
 125 +ILAPI ILboolean      ILAPIENTRY iluAlienify(void);
 126  ILAPI ILboolean      ILAPIENTRY iluBlurAvg(ILuint Iter);
 127  ILAPI ILboolean      ILAPIENTRY iluBlurGaussian(ILuint Iter);
 128 -ILAPI ILboolean      ILAPIENTRY iluBuildMipmaps(ILvoid);
 129 -ILAPI ILuint         ILAPIENTRY iluColoursUsed(ILvoid);
 130 +ILAPI ILboolean      ILAPIENTRY iluBuildMipmaps(void);
 131 +ILAPI ILuint         ILAPIENTRY iluColoursUsed(void);
 132  ILAPI ILboolean      ILAPIENTRY iluCompareImage(ILuint Comp);
 133  ILAPI ILboolean      ILAPIENTRY iluContrast(ILfloat Contrast);
 134  ILAPI ILboolean      ILAPIENTRY iluCrop(ILuint XOff, ILuint YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth);
 135  ILAPI ILvoid         ILAPIENTRY iluDeleteImage(ILuint Id);
 136 -ILAPI ILboolean      ILAPIENTRY iluEdgeDetectE(ILvoid);
 137 -ILAPI ILboolean      ILAPIENTRY iluEdgeDetectP(ILvoid);
 138 -ILAPI ILboolean      ILAPIENTRY iluEdgeDetectS(ILvoid);
 139 -ILAPI ILboolean      ILAPIENTRY iluEmboss(ILvoid);
 140 +ILAPI ILboolean      ILAPIENTRY iluEdgeDetectE(void);
 141 +ILAPI ILboolean      ILAPIENTRY iluEdgeDetectP(void);
 142 +ILAPI ILboolean      ILAPIENTRY iluEdgeDetectS(void);
 143 +ILAPI ILboolean      ILAPIENTRY iluEmboss(void);
 144  ILAPI ILboolean      ILAPIENTRY iluEnlargeCanvas(ILuint Width, ILuint Height, ILuint Depth);
 145  ILAPI ILboolean      ILAPIENTRY iluEnlargeImage(ILfloat XDim, ILfloat YDim, ILfloat ZDim);
 146 -ILAPI ILboolean      ILAPIENTRY iluEqualize(ILvoid);
 147 +ILAPI ILboolean      ILAPIENTRY iluEqualize(void);
 148  ILAPI ILstring                  ILAPIENTRY iluErrorString(ILenum Error);
 149  ILAPI ILboolean      ILAPIENTRY iluConvolution(ILint *matrix, ILint scale, ILint bias);
 150 -ILAPI ILboolean      ILAPIENTRY iluFlipImage(ILvoid);
 151 +ILAPI ILboolean      ILAPIENTRY iluFlipImage(void);
 152  ILAPI ILboolean      ILAPIENTRY iluGammaCorrect(ILfloat Gamma);
 153 -ILAPI ILuint         ILAPIENTRY iluGenImage(ILvoid);
 154 +ILAPI ILuint         ILAPIENTRY iluGenImage(void);
 155  ILAPI ILvoid         ILAPIENTRY iluGetImageInfo(ILinfo *Info);
 156  ILAPI ILint          ILAPIENTRY iluGetInteger(ILenum Mode);
 157  ILAPI ILvoid         ILAPIENTRY iluGetIntegerv(ILenum Mode, ILint *Param);
 158  ILAPI ILstring                  ILAPIENTRY iluGetString(ILenum StringName);
 159  ILAPI ILvoid         ILAPIENTRY iluImageParameter(ILenum PName, ILenum Param);
 160 -ILAPI ILvoid         ILAPIENTRY iluInit(ILvoid);
 161 -ILAPI ILboolean      ILAPIENTRY iluInvertAlpha(ILvoid);
 162 +ILAPI ILvoid         ILAPIENTRY iluInit(void);
 163 +ILAPI ILboolean      ILAPIENTRY iluInvertAlpha(void);
 164  ILAPI ILuint         ILAPIENTRY iluLoadImage(const ILstring FileName);
 165 -ILAPI ILboolean      ILAPIENTRY iluMirror(ILvoid);
 166 -ILAPI ILboolean      ILAPIENTRY iluNegative(ILvoid);
 167 +ILAPI ILboolean      ILAPIENTRY iluMirror(void);
 168 +ILAPI ILboolean      ILAPIENTRY iluNegative(void);
 169  ILAPI ILboolean      ILAPIENTRY iluNoisify(ILclampf Tolerance);
 170  ILAPI ILboolean      ILAPIENTRY iluPixelize(ILuint PixSize);
 171  ILAPI ILvoid         ILAPIENTRY iluRegionfv(ILpointf *Points, ILuint n);
 172 @@ -166,7 +166,7 @@
 173  ILAPI ILboolean      ILAPIENTRY iluScaleAlpha(ILfloat scale);
 174  ILAPI ILboolean      ILAPIENTRY iluScaleColours(ILfloat r, ILfloat g, ILfloat b);
 175  ILAPI ILboolean      ILAPIENTRY iluSharpen(ILfloat Factor, ILuint Iter);
 176 -ILAPI ILboolean      ILAPIENTRY iluSwapColours(ILvoid);
 177 +ILAPI ILboolean      ILAPIENTRY iluSwapColours(void);
 178  ILAPI ILboolean      ILAPIENTRY iluWave(ILfloat Angle);
 179
 180  #define iluColorsUsed   iluColoursUsed
 181 diff -ru DevIL-1.6.8/include/IL/ilut.h DevIL-1.6.8-gcc4.1/include/IL/ilut.h
 182 --- DevIL-1.6.8/include/IL/ilut.h       2006-07-04 16:43:23.000000000 +0200
 183 +++ DevIL-1.6.8-gcc4.1/include/IL/ilut.h        2008-07-02 09:35:47.000000000 +0200
 184 @@ -198,10 +198,10 @@
 185  ILAPI ILint                    ILAPIENTRY ilutGetInteger(ILenum Mode);
 186  ILAPI ILvoid           ILAPIENTRY ilutGetIntegerv(ILenum Mode, ILint *Param);
 187  ILAPI ILstring         ILAPIENTRY ilutGetString(ILenum StringName);
 188 -ILAPI ILvoid           ILAPIENTRY ilutInit(ILvoid);
 189 +ILAPI ILvoid           ILAPIENTRY ilutInit(void);
 190  ILAPI ILboolean                ILAPIENTRY ilutIsDisabled(ILenum Mode);
 191  ILAPI ILboolean                ILAPIENTRY ilutIsEnabled(ILenum Mode);
 192 -ILAPI ILvoid           ILAPIENTRY ilutPopAttrib(ILvoid);
 193 +ILAPI ILvoid           ILAPIENTRY ilutPopAttrib(void);
 194  ILAPI ILvoid           ILAPIENTRY ilutPushAttrib(ILuint Bits);
 195  ILAPI ILvoid           ILAPIENTRY ilutSetInteger(ILenum Mode, ILint Param);
 196
 197 @@ -211,11 +211,11 @@
 198  // ImageLib Utility Toolkit's OpenGL Functions
 199  #ifdef ILUT_USE_OPENGL
 200         ILAPI GLuint    ILAPIENTRY ilutGLBindTexImage();
 201 -       ILAPI GLuint    ILAPIENTRY ilutGLBindMipmaps(ILvoid);
 202 -       ILAPI ILboolean ILAPIENTRY ilutGLBuildMipmaps(ILvoid);
 203 +       ILAPI GLuint    ILAPIENTRY ilutGLBindMipmaps(void);
 204 +       ILAPI ILboolean ILAPIENTRY ilutGLBuildMipmaps(void);
 205         ILAPI GLuint    ILAPIENTRY ilutGLLoadImage(ILstring FileName);
 206 -       ILAPI ILboolean ILAPIENTRY ilutGLScreen(ILvoid);
 207 -       ILAPI ILboolean ILAPIENTRY ilutGLScreenie(ILvoid);
 208 +       ILAPI ILboolean ILAPIENTRY ilutGLScreen(void);
 209 +       ILAPI ILboolean ILAPIENTRY ilutGLScreenie(void);
 210         ILAPI ILboolean ILAPIENTRY ilutGLSaveImage(ILstring FileName, GLuint TexID);
 211         ILAPI ILboolean ILAPIENTRY ilutGLSetTex(GLuint TexID);
 212         ILAPI ILboolean ILAPIENTRY ilutGLTexImage(GLuint Level);
 213 @@ -259,13 +259,13 @@
 214         ILAPI HBITMAP   ILAPIENTRY ilutConvertSliceToHBitmap(HDC hDC, ILuint slice);
 215         ILAPI ILvoid    ILAPIENTRY ilutFreePaddedData(ILubyte *Data);
 216         ILAPI ILvoid    ILAPIENTRY ilutGetBmpInfo(BITMAPINFO *Info);
 217 -       ILAPI HPALETTE  ILAPIENTRY ilutGetHPal(ILvoid);
 218 -       ILAPI ILubyte*  ILAPIENTRY ilutGetPaddedData(ILvoid);
 219 -       ILAPI ILboolean ILAPIENTRY ilutGetWinClipboard(ILvoid);
 220 +       ILAPI HPALETTE  ILAPIENTRY ilutGetHPal(void);
 221 +       ILAPI ILubyte*  ILAPIENTRY ilutGetPaddedData(void);
 222 +       ILAPI ILboolean ILAPIENTRY ilutGetWinClipboard(void);
 223         ILAPI ILboolean ILAPIENTRY ilutLoadResource(HINSTANCE hInst, ILint ID, ILstring ResourceType, ILenum Type);
 224         ILAPI ILboolean ILAPIENTRY ilutSetHBitmap(HBITMAP Bitmap);
 225         ILAPI ILboolean ILAPIENTRY ilutSetHPal(HPALETTE Pal);
 226 -       ILAPI ILboolean ILAPIENTRY ilutSetWinClipboard(ILvoid);
 227 +       ILAPI ILboolean ILAPIENTRY ilutSetWinClipboard(void);
 228         ILAPI HBITMAP   ILAPIENTRY ilutWinLoadImage(ILstring FileName, HDC hDC);
 229         ILAPI ILboolean ILAPIENTRY ilutWinLoadUrl(ILstring Url);
 230         ILAPI ILboolean ILAPIENTRY ilutWinPrint(ILuint XPos, ILuint YPos, ILuint Width, ILuint Height, HDC hDC);