diff options
| author | Casey Marshall <csm@gnu.org> | 2005-12-06 06:34:05 +0000 |
|---|---|---|
| committer | Casey Marshall <csm@gnu.org> | 2005-12-06 06:34:05 +0000 |
| commit | ad165be34a2fc7f2d574c12e70fe08f4928da6a4 (patch) | |
| tree | cb58879e14543b65b44947fb9a59c83bad65c897 | |
| parent | a3fde2dbc1c42a88030f4fd58c1f5924fe69382f (diff) | |
| download | classpath-ad165be34a2fc7f2d574c12e70fe08f4928da6a4.tar.gz | |
2005-12-05 Casey Marshall <csm@gnu.org>
* native/jni/classpath/jcl.h (environ): define, or declare
'extern.'
* native/jni/java-lang/java_lang_VMProcess.c: include <jcl.h>.
Remove 'extern' define.
* native/jni/java-lang/java_lang_VMSystem.c
(Java_java_lang_VMSystem_environ): don't declare 'environ.'
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | native/jni/classpath/jcl.h | 11 | ||||
| -rw-r--r-- | native/jni/java-lang/java_lang_VMProcess.c | 13 | ||||
| -rw-r--r-- | native/jni/java-lang/java_lang_VMSystem.c | 1 |
4 files changed, 22 insertions, 12 deletions
@@ -1,3 +1,12 @@ +2005-12-05 Casey Marshall <csm@gnu.org> + + * native/jni/classpath/jcl.h (environ): define, or declare + 'extern.' + * native/jni/java-lang/java_lang_VMProcess.c: include <jcl.h>. + Remove 'extern' define. + * native/jni/java-lang/java_lang_VMSystem.c + (Java_java_lang_VMSystem_environ): don't declare 'environ.' + 2005-12-05 Tom Tromey <tromey@redhat.com> * java/lang/instrument/Instrumentation.java (redefineClasses): Javadoc diff --git a/native/jni/classpath/jcl.h b/native/jni/classpath/jcl.h index 25662c06b..9a3756238 100644 --- a/native/jni/classpath/jcl.h +++ b/native/jni/classpath/jcl.h @@ -76,4 +76,15 @@ JNIEXPORT void * JNICALL JCL_GetRawData (JNIEnv * env, jobject rawdata); #define DBG(x) #endif +/* Some O/S's don't declare 'environ' */ +#if HAVE_CRT_EXTERNS_H +/* Darwin does not have a variable named environ + but has a function which you can get the environ + variable with. */ +#include <crt_externs.h> +#define environ (*_NSGetEnviron()) +#else +extern char **environ; +#endif /* HAVE_CRT_EXTERNS_H */ + #endif diff --git a/native/jni/java-lang/java_lang_VMProcess.c b/native/jni/java-lang/java_lang_VMProcess.c index a8eb75026..af14edaa8 100644 --- a/native/jni/java-lang/java_lang_VMProcess.c +++ b/native/jni/java-lang/java_lang_VMProcess.c @@ -50,6 +50,8 @@ exception statement from your version. */ #include <fcntl.h> #include <stdio.h> +#include <jcl.h> + #include "target_native.h" #include "target_native_misc.h" @@ -57,17 +59,6 @@ exception statement from your version. */ static char *copy_string (JNIEnv * env, jobject string); static char *copy_elem (JNIEnv * env, jobject stringArray, jint i); -/* Some O/S's don't declare 'environ' */ -#if HAVE_CRT_EXTERNS_H -/* Darwin does not have a variable named environ - but has a function which you can get the environ - variable with. */ -#include <crt_externs.h> -#define environ (*_NSGetEnviron()) -#else -extern char **environ; -#endif /* HAVE_CRT_EXTERNS_H */ - /* * Internal helper function to copy a String in UTF-8 format. */ diff --git a/native/jni/java-lang/java_lang_VMSystem.c b/native/jni/java-lang/java_lang_VMSystem.c index 620ae60cb..05b0d960e 100644 --- a/native/jni/java-lang/java_lang_VMSystem.c +++ b/native/jni/java-lang/java_lang_VMSystem.c @@ -159,7 +159,6 @@ JNIEXPORT jobject JNICALL Java_java_lang_VMSystem_environ (JNIEnv *env, jclass klass __attribute__((__unused__))) { - extern char** environ; char **env_pointer; jobject variables; jclass list_class; |