gphoto2.ds: fix a compiler warning for libjpeg includes (try 2)

Austin English austinenglish at gmail.com
Mon Jun 15 11:10:46 CDT 2009


Without mangled index this time, and defining HAVE_STDLIB_H to 1.

-- 
-Austin
-------------- next part --------------
diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h
index 2af61f4..c1494c2 100644
--- a/dlls/gphoto2.ds/gphoto2_i.h
+++ b/dlls/gphoto2.ds/gphoto2_i.h
@@ -44,7 +44,13 @@
 # define UINT8 JPEG_UINT8
 # define UINT16 JPEG_UINT16
 # undef FAR
+/* Really dirty hack, but libjpeg is unmaintained, so can't this fix on their end */
+#undef HAVE_STDLIB_H
 #  include <jpeglib.h>
+/* Most packaged versions remove the HAVE_STDLIB_H definition, so work around that */
+#ifndef HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
+#endif
 # undef UINT16
 #endif
 


More information about the wine-patches mailing list