stefan pushed a commit to branch master.
commit 92de5dd3c618d891fa4bd676202d9f8e5f30a6e8
Author: Stefan Schmidt <[email protected]>
Date: Tue Jul 9 09:43:26 2013 +0100
evas/eet: Prevent libjpeg to redefine INT32.
The define prevents that INT32 gets redefined in libjpeg while it
already is defined for the mingw build.
---
src/lib/eet/eet_image.c | 1 +
src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c
index 2896260..2e903ee 100644
--- a/src/lib/eet/eet_image.c
+++ b/src/lib/eet/eet_image.c
@@ -13,6 +13,7 @@
#ifdef _WIN32
# include <winsock2.h>
# define HAVE_BOOLEAN
+# define XMD_H /* This prevents libjpeg to redefine INT32 */
#endif /* ifdef _WIN32 */
#include <stdio.h>
diff --git a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
index 31048aa..60de55a 100644
--- a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
+++ b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
@@ -8,6 +8,10 @@
# include <Evil.h>
#endif
+#ifdef _WIN32
+# define XMD_H /* This prevents libjpeg to redefine INT32 */
+#endif
+
#include <setjmp.h>
#include <jpeglib.h>
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
