X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Dependencies%2Flibjpeg%2Fjconfig.h;h=0dc5ad632eaad61b9af1cc6b16d7f9eda3eaaa61;hb=8c5a754da6e78011ecbf6a8d1ab4469070cc72b8;hp=434f1ece1752737abbb50dbc31c786ecd5dbcb89;hpb=e5717efc28b1712a354c18a5b724077426c3a36d;p=lugaru.git

diff --git a/Dependencies/libjpeg/jconfig.h b/Dependencies/libjpeg/jconfig.h
index 434f1ec..0dc5ad6 100644
--- a/Dependencies/libjpeg/jconfig.h
+++ b/Dependencies/libjpeg/jconfig.h
@@ -4,10 +4,6 @@
 /* #define NEED_BSD_STRINGS -- causes fail on Win32 */
 #define NEED_SYS_TYPES_H
 
-#ifdef JPEG_INTERNALS
-#define INLINE inline
-#endif /* JPEG_INTERNALS */
-
 #ifdef JPEG_CJPEG_DJPEG
 #define BMP_SUPPORTED		/* BMP image file format */
 #define GIF_SUPPORTED		/* GIF image file format */
@@ -16,9 +12,5 @@
 #define TARGA_SUPPORTED		/* Targa image file format */
 #endif /* JPEG_CJPEG_DJPEG */
 
-#ifdef _MSC_VER
-#ifndef INLINE
-#define INLINE __inline__
-#endif
-#endif
-
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT