diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-08 20:38:13 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-08 20:38:13 +0000 |
| commit | de83d4725adf72fb9808b30a01a5c4ec05ae8a51 (patch) | |
| tree | cf833007c737395cb44ea9f031474173d9ab680a /libjava/gnu/classpath/natSystemProperties.cc | |
| parent | 862ad8b433732c1533f670040617716f641d3a55 (diff) | |
| download | ppe42-gcc-de83d4725adf72fb9808b30a01a5c4ec05ae8a51.tar.gz ppe42-gcc-de83d4725adf72fb9808b30a01a5c4ec05ae8a51.zip | |
2006-02-08 Bryce McKinlay <mckinlay@redhat.com>
* link.cc (_Jv_Linker::print_class_loaded): Declare string constants
as "const char *".
* verify.cc (verify_fail): Likewise.
* gnu/classpath/natSystemProperties.cc (file_encoding): Likewise.
* interpret.cc (throw_internal_error, throw_class_format_error):
Likewise.
* gcj/javaprims.h (_Jv_hashUtf8String, _Jv_Utf8Const::space_needed,
_Jv_Utf8Const::init, _Jv_makeUtf8Const): Likewise.
* java/lang/Class.h (_Jv_InitPrimClass): Likewise.
* include/jvm.h (_Jv_strLengthUtf8, _Jv_makeUtf8Const): Likewise.
* defineclass.cc (throw_internal_error, throw_no_class_def_found_error,
is_attribute_name): Likewise.
* prims.cc (_Jv_strLengthUtf8, _Jv_hashUtf8String, _Jv_Utf8Const::init,
_Jv_makeUtf8Const, _Jv_InitPrimClass): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110767 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/classpath/natSystemProperties.cc')
| -rw-r--r-- | libjava/gnu/classpath/natSystemProperties.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/gnu/classpath/natSystemProperties.cc b/libjava/gnu/classpath/natSystemProperties.cc index 5d230254d9b..f21220f1f6d 100644 --- a/libjava/gnu/classpath/natSystemProperties.cc +++ b/libjava/gnu/classpath/natSystemProperties.cc @@ -62,11 +62,11 @@ _Jv_SetDLLSearchPath (const char *) #if ! defined (DEFAULT_FILE_ENCODING) && defined (HAVE_ICONV) \ && defined (HAVE_NL_LANGINFO) -static char * +static const char * file_encoding () { setlocale (LC_CTYPE, ""); - char *e = nl_langinfo (CODESET); + const char *e = nl_langinfo (CODESET); if (e == NULL || *e == '\0') e = "8859_1"; return e; @@ -80,7 +80,7 @@ file_encoding () #define DEFAULT_FILE_ENCODING "8859_1" #endif -static char *default_file_encoding = DEFAULT_FILE_ENCODING; +static const char *default_file_encoding = DEFAULT_FILE_ENCODING; #if HAVE_GETPWUID_R /* Use overload resolution to find out the signature of getpwuid_r. */ |
