summaryrefslogtreecommitdiff
path: root/ACE/ace/os_include/os_netdb.h
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ace/os_include/os_netdb.h')
-rw-r--r--ACE/ace/os_include/os_netdb.h31
1 files changed, 13 insertions, 18 deletions
diff --git a/ACE/ace/os_include/os_netdb.h b/ACE/ace/os_include/os_netdb.h
index de509b4cbc7..189f29b9dbb 100644
--- a/ACE/ace/os_include/os_netdb.h
+++ b/ACE/ace/os_include/os_netdb.h
@@ -127,24 +127,19 @@ struct servent {
# define EAI_OVERFLOW -12 /* Error result from getaddrinfo(): buffer overflow */
#endif
-#if defined (ACE_HAS_STRUCT_NETDB_DATA)
- typedef char ACE_HOSTENT_DATA[sizeof(struct hostent_data)];
- typedef char ACE_SERVENT_DATA[sizeof(struct servent_data)];
- typedef char ACE_PROTOENT_DATA[sizeof(struct protoent_data)];
-#else
-# if !defined ACE_HOSTENT_DATA_SIZE
-# define ACE_HOSTENT_DATA_SIZE (4*1024)
-# endif /*ACE_HOSTENT_DATA_SIZE */
-# if !defined ACE_SERVENT_DATA_SIZE
-# define ACE_SERVENT_DATA_SIZE (4*1024)
-# endif /*ACE_SERVENT_DATA_SIZE */
-# if !defined ACE_PROTOENT_DATA_SIZE
-# define ACE_PROTOENT_DATA_SIZE (2*1024)
-# endif /*ACE_PROTOENT_DATA_SIZE */
- typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE];
- typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE];
- typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE];
-#endif /* ACE_HAS_STRUCT_NETDB_DATA */
+#if !defined ACE_HOSTENT_DATA_SIZE
+# define ACE_HOSTENT_DATA_SIZE (4*1024)
+#endif /*ACE_HOSTENT_DATA_SIZE */
+#if !defined ACE_SERVENT_DATA_SIZE
+# define ACE_SERVENT_DATA_SIZE (4*1024)
+#endif /*ACE_SERVENT_DATA_SIZE */
+#if !defined ACE_PROTOENT_DATA_SIZE
+# define ACE_PROTOENT_DATA_SIZE (2*1024)
+#endif /*ACE_PROTOENT_DATA_SIZE */
+
+typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE];
+typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE];
+typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE];
# if !defined(MAXHOSTNAMELEN)
# define MAXHOSTNAMELEN HOST_NAME_MAX