[cp-patches] unified pointer size checks in jni (java-nio, xmlj)

[Christian Thalinger]

2005-05-13  Christian Thalinger  <address@hidden>

        * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c
        (createRawData): Use SIZEOF_VOID_P instead of 
        POINTERS_ARE_64BIT.
        * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
        (createRawData): Use SIZEOF_VOID_P instead of
        POINTERS_ARE_64BIT.
        * native/jni/xmlj/xmlj_util.c (xmljAsPointer, xmljAsField): Use 
        SIZEOF_VOID_P instead of XMLJ_64BIT_POINTER.
        * native/jni/xmlj/xmlj_util.h: Removed XMLJ_64BIT_POINTER 
        define.



Index: native/jni//java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c
===================================================================
RCS
file: 
/ahome/cacao/cacaocvs/cacao/src/classpath/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c,v
retrieving revision 1.1
diff -u -3 -p -r1.1 gnu_java_nio_charset_iconv_IconvDecoder.c
--- native/jni//java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c
4 May 2005 10:09:47 -0000       1.1
+++ native/jni//java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c
13 May 2005 12:48:04 -0000
@@ -181,7 +181,7 @@ createRawData (JNIEnv * env, jobject obj
   data_fid = (*env)->GetFieldID (env, cls, "data",
"Lgnu/classpath/RawData;");
   assert (data_fid != 0);
 
-#ifdef POINTERS_ARE_64BIT
+#if SIZEOF_VOID_P == 8
   cls = (*env)->FindClass (env, "gnu/classpath/RawData64");
   method = (*env)->GetMethodID (env, cls, "<init>", "(J)V");
   data = (*env)->NewObject (env, cls, method, (jlong) ptr);
Index: native/jni//java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
===================================================================
RCS
file: 
/ahome/cacao/cacaocvs/cacao/src/classpath/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c,v
retrieving revision 1.1
diff -u -3 -p -r1.1 gnu_java_nio_charset_iconv_IconvEncoder.c
--- native/jni//java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
4 May 2005 10:09:47 -0000       1.1
+++ native/jni//java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
13 May 2005 12:48:04 -0000
@@ -181,7 +181,7 @@ createRawData (JNIEnv * env, jobject obj
   data_fid = (*env)->GetFieldID (env, cls, "data",
"Lgnu/classpath/RawData;");
   assert (data_fid != 0);
 
-#ifdef POINTERS_ARE_64BIT
+#if SIZEOF_VOID_P == 8
   cls = (*env)->FindClass (env, "gnu/classpath/RawData64");
   method = (*env)->GetMethodID (env, cls, "<init>", "(J)V");
   data = (*env)->NewObject (env, cls, method, (jlong) ptr);
Index: native/jni//xmlj/xmlj_util.c
===================================================================
RCS
file: /ahome/cacao/cacaocvs/cacao/src/classpath/native/jni/xmlj/xmlj_util.c,v
retrieving revision 1.1
diff -u -3 -p -r1.1 xmlj_util.c
--- native/jni//xmlj/xmlj_util.c        12 Jan 2005 13:07:00 -0000
1.1
+++ native/jni//xmlj/xmlj_util.c        13 May 2005 12:48:04 -0000
@@ -35,6 +35,7 @@ this exception to your version of the li
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#include <config.h>
 #include "xmlj_util.h"
 #include "xmlj_error.h"
 #include <libxml/tree.h>
@@ -221,7 +222,7 @@ xmljAsPointer (JNIEnv *env, jobject ptr)
   jclass cls;
   jfieldID field;
  
-#if defined XMLJ_64BIT_POINTER
+#if SIZEOF_VOID_P == 8
   cls = (*env)->FindClass (env, "gnu/classpath/RawData64");
   field = (*env)->GetFieldID (env, cls, "data", "J");
   return (void *) (*env)->GetLongField (env, ptr, field);
@@ -238,7 +239,7 @@ xmljAsField (JNIEnv *env, void * ptr)
   jclass cls;
   jmethodID method;
 
-#if defined XMLJ_64BIT_POINTER
+#if SIZEOF_VOID_P == 8
   cls = (*env)->FindClass (env, "gnu/classpath/RawData64");
   method = (*env)->GetMethodID (env, cls, "<init>", "(J)V");
   return (*env)->NewObject (env, cls, method, (jlong) ptr);
Index: native/jni//xmlj/xmlj_util.h
===================================================================
RCS
file: /ahome/cacao/cacaocvs/cacao/src/classpath/native/jni/xmlj/xmlj_util.h,v
retrieving revision 1.1
diff -u -3 -p -r1.1 xmlj_util.h
--- native/jni//xmlj/xmlj_util.h        12 Jan 2005 13:07:00 -0000
1.1
+++ native/jni//xmlj/xmlj_util.h        13 May 2005 12:48:04 -0000
@@ -38,10 +38,6 @@ exception statement from your version. *
 #ifndef XMLJ_UTIL_H
 #define XMLJ_UTIL_H
 
-#if defined __64BIT__ || defined __LP64 || defined _LP64 || defined
__LP64__ || defined _ADDR64
-#  define XMLJ_64BIT_POINTER 1
-#endif 
-
 #include <jni.h>
 #include <libxml/xmlstring.h>