Merge other changes from libjpeg-turbo 0.0.90
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3999 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/jpeg/jpeglib.h b/common/jpeg/jpeglib.h
index 31f0dd6..7cc8039 100644
--- a/common/jpeg/jpeglib.h
+++ b/common/jpeg/jpeglib.h
@@ -14,6 +14,10 @@
#ifndef JPEGLIB_H
#define JPEGLIB_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* First we include the configuration files that record how this
* installation of the JPEG library is set up. jconfig.h can be
@@ -219,7 +223,7 @@
JCS_EXT_BGR, /* blue/green/red */
JCS_EXT_BGRX, /* blue/green/red/x */
JCS_EXT_XBGR, /* x/blue/green/red */
- JCS_EXT_XRGB, /* x/red/green/blue */
+ JCS_EXT_XRGB /* x/red/green/blue */
} J_COLOR_SPACE;
/* DCT/IDCT algorithm options. */
@@ -1103,4 +1107,8 @@
#include "jerror.h" /* fetch error codes too */
#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif /* JPEGLIB_H */