0
|
1 |
diff --git jmorecfg.h jmorecfg.h
|
|
2 |
index 54a7d1c..b0b5870 100644
|
|
3 |
--- jmorecfg.h
|
|
4 |
+++ jmorecfg.h
|
|
5 |
@@ -157,7 +157,7 @@ typedef short INT16;
|
|
6 |
|
|
7 |
/* INT32 must hold at least signed 32-bit values. */
|
|
8 |
|
|
9 |
-#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
|
|
10 |
+#if !defined(XMD_H) && !defined(VXWORKS) /* X11/xmd.h correctly defines INT32 */
|
|
11 |
typedef long INT32;
|
|
12 |
#endif
|
|
13 |
|
|
14 |
@@ -183,6 +183,9 @@ typedef unsigned int JDIMENSION;
|
|
15 |
/* a function called through method pointers: */
|
|
16 |
#define METHODDEF(type) static type
|
|
17 |
/* a function used only in its module: */
|
|
18 |
+#if defined(VXWORKS) && defined(LOCAL)
|
|
19 |
+# undef LOCAL
|
|
20 |
+#endif
|
|
21 |
#define LOCAL(type) static type
|
|
22 |
/* a function referenced thru EXTERNs: */
|
|
23 |
#define GLOBAL(type) type
|