OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR bootstrap/50888 (Bootstrap failure in libjava against latest git glibc) 

PR bootstrap/50888
	* prims.cc: Don't include ctype.h.
	(c_isspace): Define.
	(next_property_key, next_property_value): Use it instead
	of isspace.

From-SVN: r181688
This commit is contained in:
Jakub Jelinek 2011-11-24 08:24:43 +01:00 committed by Jakub Jelinek
parent 42985fd5de
commit 789a08588d
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
2011-11-24 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/50888
* prims.cc: Don't include ctype.h.
(c_isspace): Define.
(next_property_key, next_property_value): Use it instead
of isspace.
2011-10-18 Uros Bizjak <ubizjak@gmail.com>
Eric Botcazou <ebotcazou@adacore.com>

13
libjava/prims.cc
View File

@ -38,7 +38,6 @@ details. */
#endif
#ifndef DISABLE_GETENV_PROPERTIES
#include <ctype.h>
#include <java-props.h>
#define PROCESS_GCJ_PROPERTIES process_gcj_properties()
#else
@ -985,6 +984,8 @@ static java::lang::Thread *main_thread;
#ifndef DISABLE_GETENV_PROPERTIES
#define c_isspace(c) (memchr (" \t\n\r\v\f", c, 6) != NULL)
static char *
next_property_key (char *s, size_t *length)
{
@ -993,7 +994,7 @@ next_property_key (char *s, size_t *length)
JvAssert (s);
// Skip over whitespace
while (isspace (*s))
while (c_isspace (*s))
s++;
// If we've reached the end, return NULL. Also return NULL if for
@ -1005,7 +1006,7 @@ next_property_key (char *s, size_t *length)
// Determine the length of the property key.
while (s[l] != 0
&& ! isspace (s[l])
&& ! c_isspace (s[l])
&& s[l] != ':'
&& s[l] != '=')
{
@ -1027,19 +1028,19 @@ next_property_value (char *s, size_t *length)
JvAssert (s);
while (isspace (*s))
while (c_isspace (*s))
s++;
if (*s == ':'
|| *s == '=')
s++;
while (isspace (*s))
while (c_isspace (*s))
s++;
// Determine the length of the property value.
while (s[l] != 0
&& ! isspace (s[l])
&& ! c_isspace (s[l])
&& s[l] != ':'
&& s[l] != '=')
{