Mercurial Mercurial > jdk-sandbox / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jdk/src/solaris/native/java/lang/java_props_md.c
changeset 6850 56966b0a6a0d
parent 6489 9e7015635425
child 7018 154795ed10de 
--- a/jdk/src/solaris/native/java/lang/java_props_md.c	Thu Oct 07 10:35:36 2010 +0100
+++ b/jdk/src/solaris/native/java/lang/java_props_md.c	Thu Oct 07 14:36:17 2010 +0100
@@ -46,7 +46,9 @@
 #include "java_props.h"
 
 #ifdef __linux__
-#define CODESET _NL_CTYPE_CODESET_NAME
+  #ifndef CODESET
+  #define CODESET _NL_CTYPE_CODESET_NAME
+  #endif
 #else
 #ifdef ALT_CODESET_KEY
 #define CODESET ALT_CODESET_KEY
@@ -289,7 +291,7 @@
 java_props_t *
 GetJavaProperties(JNIEnv *env)
 {
-    static java_props_t sprops = {0};
+    static java_props_t sprops;
     char *v; /* tmp var */
 
     if (sprops.user_dir) {
jdk-sandbox