emile - fix windows build

use evil and fix libjpeg boolean re-def.

diff --git a/src/lib/emile/emile_image.c b/src/lib/emile/emile_image.c
index 9f0a3ac..3432ccf 100644 (file)
--- a/src/lib/emile/emile_image.c
+++ b/src/lib/emile/emile_image.c
@@ -8,6 +8,9 @@
 
 #ifdef _WIN32
 #include <winsock2.h>
+#include <Evil.h>
+#define HAVE_BOOLEAN /* This prevents libjpeg to redefine boolean */
+#define XMD_H /* This prevents libjpeg to redefine INT32 */
 #endif
 
 #ifdef ENABLE_LIBLZ4
@@ -16,19 +19,11 @@
 #include "lz4.h"
 #endif
 
-#ifdef _WIN32
-#define XMD_H /* This prevents libjpeg to redefine INT32 */
-#endif
-
 #include <stdio.h>
 #include <setjmp.h>
 #include <jpeglib.h>
 #include <jerror.h>
 
-#ifdef _WIN32
-#include <Evil.h>
-#endif
-
 #include "rg_etc1.h"
 #include "Emile.h"
 #include "emile_private.h"