2010-01-26 Robert Dewar <dewar@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / s-oscons-tmplt.c

diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
index 3771f4c..1e8bd52 100644 (file)
--- 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>
@@ -1198,7 +1200,7 @@ CND(SIZEOF_tv_usec, "tv_usec")
 }
 /*
 
-   --  Sizes of protocol specific address types (for sockaddr.sa_len)
+   --  Sizes of various data types
 */
 
 #define SIZEOF_sockaddr_in (sizeof (struct sockaddr_in))
@@ -1210,12 +1212,11 @@ CND(SIZEOF_sockaddr_in, "struct sockaddr_in")
 #endif
 CND(SIZEOF_sockaddr_in6, "struct sockaddr_in6")
 
-/*
-
-   --  Size of file descriptor sets
-*/
 #define SIZEOF_fd_set (sizeof (fd_set))
 CND(SIZEOF_fd_set, "fd_set");
+
+#define SIZEOF_struct_servent (sizeof (struct servent))
+CND(SIZEOF_struct_servent, "struct servent");
 /*
 
    --  Fields of struct hostent
@@ -1275,27 +1276,6 @@ CST(Inet_Pton_Linkname, "")
 
 #endif /* HAVE_SOCKETS */
 
-/*
-
-   ---------------------------------
-   -- C runtime library interface --
-   ---------------------------------
-
-*/
-#if defined (__VMS)
-# define malloc32_Linkname  "_malloc32"
-# define realloc32_Linkname "_realloc32"
-# define strerror_Linkname  "DECC$STRERROR"
-#else
-# define malloc32_Linkname  "malloc"
-# define realloc32_Linkname "realloc"
-# define strerror_Linkname  "strerror"
-#endif
-
-CST(malloc32_Linkname, "")
-CST(realloc32_Linkname, "")
-CST(strerror_Linkname, "")
-
 /**
  **  System-specific constants follow
  **  Each section should be activated if compiling for the corresponding