qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-06 07:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

windows has a LoadImage #define, so kill it :)

Browse source
This commit is contained in:
Bill Currie 2003-09-08 15:49:21 +00:00
parent 61a2840870
commit 2ea7ca1efd
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/QF/GL/extensions.h
View file

@ -38,6 +38,7 @@
# ifdef _WIN32 # ifdef _WIN32
# include <windows.h> # include <windows.h>
# define GLAPIENTRY WINAPI # define GLAPIENTRY WINAPI
# undef LoadImage
# else # else
# ifdef APIENTRY # ifdef APIENTRY
# define GLAPIENTRY APIENTRY # define GLAPIENTRY APIENTRY

1
include/winquake.h
View file

@ -61,6 +61,7 @@
#undef byte #undef byte
#undef shutdown #undef shutdown
#undef LoadImage
#include "QF/qtypes.h" #include "QF/qtypes.h"

1
libs/image/png.c
View file

@ -182,6 +182,7 @@ LoadPNG (QFile *infile)
#else #else
#include "QF/image.h" #include "QF/image.h"
#include "QF/png.h"
tex_t * tex_t *
LoadPNG (QFile *infile) LoadPNG (QFile *infile)