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

re GNATS libgcj/15 (_REENTRANT should be defined more consistently)

Browse Source 
Fix for PR libgcj/15:
	* java/util/natGregorianCalendar.cc (_REENTRANT,
	_POSIX_PTHREAD_SEMANTICS): Don't define.
	* java/net/natInetAddress.cc (_REENTRANT): Don't define.
	* java/lang/natSystem.cc (_REENTRANT, _POSIX_PTHREAD_SEMANTICS):
	Don't define.
	* java/io/natFile.cc (_REENTRANT, _POSIX_PTHREAD_SEMANTICS): Don't
	define.
	* configure: Rebuilt.
	* configure.in: If using POSIX threads, define _REENTRANT if
	needed.  Define _POSIX_PTHREAD_SEMANTICS.  Don't define
	GETHOSTBYNAME_R_NEEDS_REENTRANT.

From-SVN: r33318
This commit is contained in:
Tom Tromey 2000-04-21 20:38:43 +00:00 committed by Tom Tromey
parent b2dad0e372
commit 7234f9bc03
5 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libjava/ChangeLog
View File

@ -1,5 +1,18 @@
2000-04-21 Tom Tromey <tromey@cygnus.com>
Fix for PR libgcj/15:
* java/util/natGregorianCalendar.cc (_REENTRANT,
_POSIX_PTHREAD_SEMANTICS): Don't define.
* java/net/natInetAddress.cc (_REENTRANT): Don't define.
* java/lang/natSystem.cc (_REENTRANT, _POSIX_PTHREAD_SEMANTICS):
Don't define.
* java/io/natFile.cc (_REENTRANT, _POSIX_PTHREAD_SEMANTICS): Don't
define.
* configure: Rebuilt.
* configure.in: If using POSIX threads, define _REENTRANT if
needed. Define _POSIX_PTHREAD_SEMANTICS. Don't define
GETHOSTBYNAME_R_NEEDS_REENTRANT.
* java/io/PipedInputStream.java, java/io/PipedReader.java,
java/io/PipedOutputStream.java, java/io/PipedWriter.java: New
version from Classpath.

6
libjava/java/io/natFile.cc
View File

@ -1,6 +1,6 @@
// natFile.cc - Native part of File class.
/* Copyright (C) 1998, 1999 Free Software Foundation
/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
This file is part of libgcj.
@ -21,10 +21,6 @@ details. */
#endif
#include <stdlib.h>
#ifdef HAVE_DIRENT_H
#define _POSIX_PTHREAD_SEMANTICS
#ifndef _REENTRANT
# define _REENTRANT
#endif
#include <dirent.h>
#endif
#include <string.h>

7
libjava/java/lang/natSystem.cc
View File

@ -10,13 +10,6 @@ details. */
#include <config.h>
#ifdef HAVE_GETPWUID_R
#define _POSIX_PTHREAD_SEMANTICS
#ifndef _REENTRANT
#define _REENTRANT
#endif
#endif
#include <string.h>
#include <time.h>
#include <stdlib.h>

6
libjava/java/net/natInetAddress.cc
View File

@ -1,6 +1,6 @@
// natInetAddress.cc
/* Copyright (C) 1998, 1999 Free Software Foundation
/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
This file is part of libgcj.
@ -10,10 +10,6 @@ details. */
#include <config.h>
#if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT)
# define _REENTRANT 1
#endif
#ifdef USE_WINSOCK
#include <windows.h>

12
libjava/java/util/natGregorianCalendar.cc
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1998, 1999 Free Software Foundation
/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
This file is part of libgcj.
@ -8,16 +8,6 @@ details. */
#include <config.h>
// We want to make sure to pick up the POSIX `_r' functions. Some
// systems, such as Solaris 2.6, require this define in order to
// declare the functions in the appropriate header.
#if defined (HAVE_GMTIME_R) || defined (HAVE_LOCALTIME_R)
# define _POSIX_PTHREAD_SEMANTICS
# ifndef _REENTRANT
# define _REENTRANT
# endif /* _REENTRANT */
#endif
#ifdef ECOS
#include <string.h>
#endif