aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2009-11-30 21:12:13 +0000
committerRainer Orth <ro@gcc.gnu.org>2009-11-30 21:12:13 +0000
commit6e15674ae2fd1bf9fdd546cc34a60a5940acec6e (patch)
treed17d757266e63b5ba52178b727e9874ec690decb
parent7c1dab0d8b4eef485b57813e1bb68542980db377 (diff)
downloadgcc-6e15674ae2fd1bf9fdd546cc34a60a5940acec6e.zip
gcc-6e15674ae2fd1bf9fdd546cc34a60a5940acec6e.tar.gz
gcc-6e15674ae2fd1bf9fdd546cc34a60a5940acec6e.tar.bz2
s-oscons-tmplt.c: Only define _XOPEN5, IOV_MAX if _XOPEN_IOV_MAX is defined.
* s-oscons-tmplt.c [__mips && __sgi]: Only define _XOPEN5, IOV_MAX if _XOPEN_IOV_MAX is defined. From-SVN: r154841
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/s-oscons-tmplt.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 1e00605..cdc2589 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-30 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * s-oscons-tmplt.c [__mips && __sgi]: Only define _XOPEN5, IOV_MAX
+ if _XOPEN_IOV_MAX is defined.
+
2009-11-30 Vasiliy Fofanov <fofanov@adacore.com>
* vms_data.ads: Add new VMS qualifiers,
diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
index a3f33d1..1e8bd52 100644
--- a/gcc/ada/s-oscons-tmplt.c
+++ b/gcc/ada/s-oscons-tmplt.c
@@ -84,12 +84,14 @@ pragma Style_Checks ("M32766");
#define _XOPEN_SOURCE 500
#elif defined (__mips) && defined (__sgi)
-/** For IRIX _XOPEN5 must be defined and _XOPEN_IOV_MAX must be used as IOV_MAX,
- ** otherwise IOV_MAX is not defined.
+/** For IRIX 6, _XOPEN5 must be defined and _XOPEN_IOV_MAX must be used as
+ ** IOV_MAX, otherwise IOV_MAX is not defined. IRIX 5 has neither.
**/
+#ifdef _XOPEN_IOV_MAX
#define _XOPEN5
#define IOV_MAX _XOPEN_IOV_MAX
#endif
+#endif
#include <stdlib.h>
#include <string.h>