[commit-cp] classpath ChangeLog include/jni.h

[Tom Tromey]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Changes by:     Tom Tromey <tromey>     06/06/06 19:11:16

Modified files:
        .              : ChangeLog 
        include        : jni.h 

Log message:
                * include/jni.h (JDK1_1InitArgs): New struct.
                (JDK1_1AttachArgs): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7685&r2=1.7686
http://cvs.savannah.gnu.org/viewcvs/classpath/include/jni.h?cvsroot=classpath&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7685
retrieving revision 1.7686
diff -u -b -r1.7685 -r1.7686
--- ChangeLog   6 Jun 2006 18:27:43 -0000       1.7685
+++ ChangeLog   6 Jun 2006 19:11:16 -0000       1.7686
@@ -1,5 +1,10 @@
 2006-06-06  Tom Tromey  <address@hidden>
 
+       * include/jni.h (JDK1_1InitArgs): New struct.
+       (JDK1_1AttachArgs): Likewise.
+
+2006-06-06  Tom Tromey  <address@hidden>
+
        * java/security/UnresolvedPermission.java (getUnresolvedType): New
        method.
        (getUnresolvedName): New method.

Index: include/jni.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/jni.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- include/jni.h       2 Jul 2005 20:32:22 -0000       1.6
+++ include/jni.h       6 Jun 2006 19:11:16 -0000       1.7
@@ -1,5 +1,5 @@
 /* jni.h
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005  Free Software 
Foundation
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006  Free Software 
Foundation
 
 This file is part of GNU Classpath.
 
@@ -1584,6 +1584,45 @@
   jboolean ignoreUnrecognized;
 } JavaVMInitArgs;
 
+typedef struct JDK1_1InitArgs
+{
+  /* VM version.  Should be JNI_VERSION_1_1.  Note that before JDK
+     1.1.2, this field was named 'reserved0'.  (I don't know what the
+     current 'reserved0' field was named then.)  */
+  jint version;
+
+  /* A null-terminated array of environment strings, each of the form
+     "KEY=VALUE".  This is used to set system properties.  Note that
+     before JDK 1.1.2, this field was named 'reserved1'.  */
+  char **properties;
+
+  jint checkSource;
+  jint nativeStackSize;
+  jint javaStackSize;
+  jint minHeapSize;
+  jint maxHeapSize;
+  jint verifyMode;
+  const char *classpath;
+
+  jint (*vfprintf) (FILE *file, const char *fmt, va_list args);
+  void (*exit) (jint value);
+  void (*abort) ();
+
+  jint enableClassGC;
+  jint enableVerboseGC;
+  jint disableAsyncGC;
+
+  jint reserved0;
+  jint reserved1;
+  jint reserved2;
+} JDK1_1InitArgs;
+
+typedef struct JDK1_1AttachArgs
+{
+  /* Dummy field since C cannot have empty structs.  The name and type
+     are chosen to comply with the spec.  */
+  void *__padding;
+} JDK1_1AttachArgs;
 
 
 /* Keep c-font-lock-extra-types in alphabetical order. */