OpenJDK / portola / portola
changeset 7951:8479f9f404f8
7002766: Java2d: Changes to correct c/c++ language issues for use of parfait
Reviewed-by: jgodinez, prr
| author | bae |
|---|---|
| date | Mon, 24 Jan 2011 15:14:26 +0300 |
| parents | dc8f97e15f9b |
| children | 5290e1887780 |
| files | jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h Fri Jan 21 08:04:04 2011 -0800 +++ b/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h Mon Jan 24 15:14:26 2011 +0300 @@ -161,11 +161,11 @@ /* INT32 must hold at least signed 32-bit values. */ -#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ -#ifndef _LP64 +#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ +#if defined(_LP64) || defined(_WIN32) /* _WIN32 is on all windows platfroms (x86 and x64) */ +typedef int INT32; +#else typedef long INT32; -#else -typedef int INT32; #endif #endif @@ -221,11 +221,14 @@ * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol. */ + +#ifndef FAR #ifdef NEED_FAR_POINTERS #define FAR far #else #define FAR #endif +#endif /*
--- a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Fri Jan 21 08:04:04 2011 -0800 +++ b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Mon Jan 24 15:14:26 2011 +0300 @@ -137,7 +137,7 @@ JNU_ThrowByName(env, "java/awt/color/CMMException", errMsg); } -JNIEXPORT int JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) { javaVM = jvm; cmsSetLogErrorHandler(errorHandler);