LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Fix mingw-w64 build

Browse Source 
On Windows with mingw-w64, Pillow includes windows.h, and thus
including Imaging.h would result in a name conflict of "TRANSPARENT",
which windows.h #defines but overviewer.h wants to use as enum.

For the record, this used to not be broken back when I initially
fixed Pillow for mingw-w64, so the change got somewhere introduced
between then and now.
This commit is contained in:
Nicolas F
2015-08-15 23:50:40 +02:00
parent afc1c4f924
commit a8c71d089d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overviewer_core/src/overviewer.h
View File

@@ -32,6 +32,8 @@
#include <Python.h> #include <Python.h>
#include <numpy/arrayobject.h> #include <numpy/arrayobject.h>
#include <Imaging.h> #include <Imaging.h>
/* Fix Pillow on mingw-w64 which includes windows.h in Imaging.h */
#undef TRANSPARENT
/* like (a * b + 127) / 255), but much faster on most platforms /* like (a * b + 127) / 255), but much faster on most platforms
from PIL's _imaging.c */ from PIL's _imaging.c */