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 7157 416373242434
parent 6850 56966b0a6a0d
parent 7017 f3bfa15db005
child 7248 6a95f692e203 
--- a/jdk/src/solaris/native/java/lang/java_props_md.c	Tue Nov 02 10:34:46 2010 -0700
+++ b/jdk/src/solaris/native/java/lang/java_props_md.c	Wed Nov 03 14:12:45 2010 -0700
@@ -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
@@ -305,7 +307,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