summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-31 09:32:14 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-31 09:32:14 +0100
commit412b89afbab91e3c104b012a2c1ec8b770ee6ab8 (patch)
tree9272a54a278a4c4e8b09e635579ab1e657fdf436
parent21522e4a9a3b223d29858cb35fe5e61ef8faf5b0 (diff)
downloadsamba-412b89afbab91e3c104b012a2c1ec8b770ee6ab8.tar.gz
samba-412b89afbab91e3c104b012a2c1ec8b770ee6ab8.tar.bz2
samba-412b89afbab91e3c104b012a2c1ec8b770ee6ab8.zip
lib/replace: move MAXHOSTNAMELEN to system/network.h
Some platforms define it in netdb.h, so we should define the replace after including metdb.h. metze
-rw-r--r--lib/replace/replace.h12
-rw-r--r--lib/replace/system/network.h6
2 files changed, 5 insertions, 13 deletions
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 688a7466c3..c5b8676acf 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -503,18 +503,6 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset)
? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
#define _TYPE_MAXIMUM(t) ((t) (~ (t) 0 - _TYPE_MINIMUM (t)))
-#ifndef HOST_NAME_MAX
-#define HOST_NAME_MAX 255
-#endif
-
-/*
- * Some older systems seem not to have MAXHOSTNAMELEN
- * defined.
- */
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN HOST_NAME_MAX
-#endif
-
#ifndef UINT16_MAX
#define UINT16_MAX 65535
#endif
diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h
index 473d79b5f2..40d20db2d4 100644
--- a/lib/replace/system/network.h
+++ b/lib/replace/system/network.h
@@ -271,7 +271,11 @@ int rep_socketpair(int d, int type, int protocol, int sv[2]);
#endif
#ifndef HOST_NAME_MAX
-#define HOST_NAME_MAX 256
+#define HOST_NAME_MAX 255
+#endif
+
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN HOST_NAME_MAX
#endif
#ifndef HAVE_SA_FAMILY_T