summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-21 13:29:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:05 -0500
commit51f3a6a5e86ab648365a03d3188002ffc94afd41 (patch)
tree0c83cf1277dcb5c3c477b1ad78e80f2cfb0d87e8
parent913006fa2e136001ea59182392fef08f65c2acfc (diff)
downloadsamba-51f3a6a5e86ab648365a03d3188002ffc94afd41.tar.gz
samba-51f3a6a5e86ab648365a03d3188002ffc94afd41.tar.bz2
samba-51f3a6a5e86ab648365a03d3188002ffc94afd41.zip
r4900: build fix for IRIX 6.5
(This used to be commit f6ff9e6f39efdb312384ebb651b8e0f01e9e8df1)
-rw-r--r--source4/include/includes.h6
-rw-r--r--source4/include/system/filesys.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index a87161af80..8c2e96b62e 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -321,10 +321,14 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
#endif
#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
-#endif /* _INCLUDES_H */
+#ifndef UINT16_MAX
+#define UINT16_MAX 65535
+#endif
/*
type safe varient of smb_xmalloc()
*/
#define smb_xmalloc_p(type) (type *)smb_xmalloc(sizeof(type))
+#endif /* _INCLUDES_H */
+
diff --git a/source4/include/system/filesys.h b/source4/include/system/filesys.h
index 619b97d9bc..589bf9b0d9 100644
--- a/source4/include/system/filesys.h
+++ b/source4/include/system/filesys.h
@@ -175,10 +175,6 @@
int rename(const char *zfrom, const char *zto);
#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX 65535
-#endif
-
#ifndef HAVE_FTRUNCATE
int ftruncate(int f,long l);
#endif