link.cc (_Jv_Linker::print_class_loaded): Declare string constants as "const char *".
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. From-SVN: r110767
This commit is contained in:
parent
8b1753e3ec
commit
2cf94e58cb
10 changed files with 48 additions and 31 deletions
|
@ -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. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue