svn commit: samba r10664 - in branches/SAMBA_4_0/source: include/system lib/replace

[jelmer at samba.org]

Author: jelmer
Date: 2005-09-30 23:10:20 +0000 (Fri, 30 Sep 2005)
New Revision: 10664

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10664

Log:
Include limits.h in replace.h for HOST_NAME_MAX

Modified:
   branches/SAMBA_4_0/source/include/system/filesys.h
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/include/system/filesys.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/filesys.h	2005-09-30 22:08:06 UTC (rev 10663)
+++ branches/SAMBA_4_0/source/include/system/filesys.h	2005-09-30 23:10:20 UTC (rev 10664)
@@ -103,25 +103,11 @@
 #include <sys/xattr.h>
 #endif
 
-/* Load header file for dynamic linking stuff */
-#ifdef HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
 
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-
-
-#ifndef RTLD_LAZY
-#define RTLD_LAZY 0
-#endif
-
-
 /* Some POSIX definitions for those without */
  
 #ifndef S_IFDIR
@@ -171,14 +157,6 @@
 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
 #endif
 
-#ifndef HAVE_RENAME
-int rename(const char *zfrom, const char *zto);
-#endif
-
-#ifndef HAVE_FTRUNCATE
-int ftruncate(int f,long l);
-#endif
-
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 256
 #endif

Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h	2005-09-30 22:08:06 UTC (rev 10663)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h	2005-09-30 23:10:20 UTC (rev 10664)
@@ -80,6 +80,14 @@
 int setenv(const char *name, const char *value, int overwrite); 
 #endif
 
+#ifndef HAVE_RENAME
+int rename(const char *zfrom, const char *zto);
+#endif
+
+#ifndef HAVE_FTRUNCATE
+int ftruncate(int f,long l);
+#endif
+
 #ifndef HAVE_VASPRINTF_DECL
 int vasprintf(char **ptr, const char *format, va_list ap);
 #endif
@@ -132,13 +140,26 @@
 typedef int (*comparison_fn_t)(const void *, const void *);
 #endif
 
+/* Load header file for dynamic linking stuff */
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
 #endif
 
+#ifndef RTLD_LAZY
+#define RTLD_LAZY 0
+#endif
+
 #ifndef HAVE_SECURE_MKSTEMP
 #define mkstemp(path) rep_mkstemp(path)
 int rep_mkstemp(char *temp);
 #endif
 
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
 #endif
+
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 64
+#endif
+
+#endif