From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 31 Jan 2009 08:32:14 +0000 (+0100)
Subject: lib/replace: move MAXHOSTNAMELEN to system/network.h
X-Git-Tag: samba-4.0.0alpha7~417^2~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=412b89afbab91e3c104b012a2c1ec8b770ee6ab8;p=thirdparty%2Fsamba.git

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
---

diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 688a7466c3d..c5b8676acfa 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 473d79b5f29..40d20db2d4a 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