diff options
Diffstat (limited to 'src/3rdparty/libjpeg/jmorecfg.h')
| -rw-r--r-- | src/3rdparty/libjpeg/jmorecfg.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/libjpeg/jmorecfg.h b/src/3rdparty/libjpeg/jmorecfg.h index 928d052..8365392 100644 --- a/src/3rdparty/libjpeg/jmorecfg.h +++ b/src/3rdparty/libjpeg/jmorecfg.h @@ -162,11 +162,13 @@ typedef short INT16; #ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */ #ifndef _BASETSD_H /* MinGW is slightly different */ #ifndef QGLOBAL_H /* Qt defines it in qglobal.h */ +#ifndef VXWORKS typedef long INT32; #endif #endif #endif #endif +#endif /* Datatype used for image dimensions. The JPEG standard only supports * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore @@ -187,6 +189,10 @@ typedef unsigned int JDIMENSION; * or code profilers that require it. */ +#if defined(VXWORKS) && defined(LOCAL) +#undef LOCAL +#endif + /* a function called through method pointers: */ #define METHODDEF(type) static type /* a function used only in its module: */ |