Changeset 561 for trunk/src/3rdparty/libjpeg/jmorecfg.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/libjpeg/jmorecfg.h (modified) (2 diffs)

trunk/src/3rdparty/libjpeg/jmorecfg.h

@@ -158 +158 @@
 /* INT32 must hold at least signed 32-bit values. */
 
-#ifndef XMD_H                   /* X11/xmd.h correctly defines INT32 */
+#if !defined(XMD_H) && !defined(VXWORKS)                        /* X11/xmd.h correctly defines INT32 */
 typedef long INT32;
 #endif
@@ -184 +184 @@
 #define METHODDEF(type)         static type
 /* a function used only in its module: */
+#if defined(VXWORKS) && defined(LOCAL)
+# undef LOCAL
+#endif
 #define LOCAL(type)             static type
 /* a function referenced thru EXTERNs: */