stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7002766: Java2d: Changes to correct c/c++ language issues for use of parfait

Browse Source 
Reviewed-by: jgodinez, prr
This commit is contained in:
Andrew Brygin 2011-01-24 15:14:26 +03:00
parent 6c31af960e
commit e1a25da53b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h
View File

@ -161,11 +161,11 @@ typedef short INT16;
/* INT32 must hold at least signed 32-bit values. */
#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
#ifndef _LP64
typedef long INT32;
#else
#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;
#endif
#endif
@ -221,11 +221,14 @@ typedef unsigned int JDIMENSION;
* 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
/*

2
jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
View File

@ -137,7 +137,7 @@ void errorHandler(cmsContext ContextID, cmsUInt32Number errorCode,
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);