From 0253d413997fa9f469384a9c159faf7297fa236e Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 17 Dec 2019 12:56:25 +0000 Subject: [PATCH] il_devil.cpp: Rename mips to mipmaps Something in my MIPS toolchain defines a constant `mips`, resulting in compilation error here. My toolchain comes from buildroot so it's likely that other users may experience the same issue. I'm hoping to fix the root cause later on my side, but for now the easiest seems to be to rename the variable in DevIL. --- DevIL/src-IL/src/il_devil.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DevIL/src-IL/src/il_devil.cpp b/DevIL/src-IL/src/il_devil.cpp index c9eeb5d5..c47a8f13 100644 --- a/DevIL/src-IL/src/il_devil.cpp +++ b/DevIL/src-IL/src/il_devil.cpp @@ -187,7 +187,7 @@ ILboolean ILAPIENTRY ilTexImageSurface(ILuint Width, ILuint Height, ILuint Depth // Internal version of ilTexImageSurface. ILboolean ILAPIENTRY ilTexImageSurface_(ILimage *Image, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, void *Data) { - ILimage* mips; + ILimage* mipmaps; ILimage* next; ILimage* faces; ILimage* layers; @@ -220,7 +220,7 @@ ILboolean ILAPIENTRY ilTexImageSurface_(ILimage *Image, ILuint Width, ILuint Hei return IL_FALSE; }*/ - mips = Image->Mipmaps; + mipmaps = Image->Mipmaps; next = Image->Next; faces = Image->Faces; layers = Image->Layers; @@ -230,7 +230,7 @@ ILboolean ILAPIENTRY ilTexImageSurface_(ILimage *Image, ILuint Width, ILuint Hei retval = ilInitImage(Image, Width, Height, Depth, Bpp, Format, Type, Data); // reset our chains - Image->Mipmaps = mips; + Image->Mipmaps = mipmaps; Image->Next = next; Image->Faces = faces; Image->Layers = layers;