From: Arnaud Charlet <charlet@adacore.com>
Date: Tue, 17 Sep 2019 07:59:43 +0000 (+0000)
Subject: [Ada] PR ada/91268 Do not redefine macros
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5c7cf10a6334dc9fcd8ad2362e809920ee205ff5;p=gcc.git

[Ada] PR ada/91268 Do not redefine macros

This should fix PR ada/91268 by only defining macros if not already
done.

2019-09-17  Arnaud Charlet  <charlet@adacore.com>

gcc/ada/

	* adaint.c (_REENTRANT, _THREAD_SAFE): Only define if needed.

From-SVN: r275774
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9193e6f1750..5b1a7d13cb1 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2019-09-17  Arnaud Charlet  <charlet@adacore.com>
+
+	* adaint.c (_REENTRANT, _THREAD_SAFE): Only define if needed.
+
 2019-09-17  Arnaud Charlet  <charlet@adacore.com>
 
 	* libgnat/s-bitfie.ads (Val_Bits, Val_Bytes): Define from
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 7290f7a3d72..c76e9ad5955 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -35,8 +35,14 @@
    library calls directly. This file contains all other routines.  */
 
 /* Ensure access to errno is thread safe.  */
+
+#ifndef _REENTRANT
 #define _REENTRANT
+#endif
+
+#ifndef _THREAD_SAFE
 #define _THREAD_SAFE
+#endif
 
 /* Use 64 bit Large File API */
 #if defined (__QNX__)