summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2004-09-07 23:30:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:37 -0500
commitfc84e916f628b4fb6f6667ad45d0ced0e9134b23 (patch)
tree1476ec95ccd518ab9aab9d627e6d2147b632539b
parent12c03ce05fd1c47dcb2b7ffc9b6bc3112bdef169 (diff)
downloadsamba-fc84e916f628b4fb6f6667ad45d0ced0e9134b23.tar.gz
samba-fc84e916f628b4fb6f6667ad45d0ced0e9134b23.tar.bz2
samba-fc84e916f628b4fb6f6667ad45d0ced0e9134b23.zip
r2246: Some good fixes for HPUX from JBravo on #samba-technical:
- Fix linker options so that stuff actually builds (oops - part of this commit was accidentally made in -r2245) - Add some preprocessor magic to avoid warnings being printed for every single C file being compiled. This was due to a bug in the HPUX system header files. This should make the HPUX build farm machine build again. (This used to be commit 46b9d6dcb5bdd47ea82f904d8fac4efe8dc94c9f)
-rw-r--r--source3/include/includes.h39
1 files changed, 39 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 66994e9ca9..56624e5198 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -309,6 +309,19 @@
#endif
#ifdef HAVE_SHADOW_H
+/*
+ * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in <netinet/tcp.h> which
+ * was included above. However <rpc/rpc.h> includes <sys/xti.h> which defines
+ * them again without checking if they already exsist. This generates
+ * two "Redefinition of macro" warnings for every single .c file that is
+ * compiled.
+ */
+#if defined(HPUX) && defined(TCP_NODELAY)
+#undef TCP_NODELAY
+#endif
+#if defined(HPUX) && defined(TCP_MAXSEG)
+#undef TCP_MAXSEG
+#endif
#include <shadow.h>
#endif
@@ -361,6 +374,19 @@
#if defined(HAVE_SYS_SECURITY_H) && defined(HAVE_RPC_AUTH_ERROR_CONFLICT)
#undef AUTH_ERROR
#endif
+/*
+ * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in <netinet/tcp.h> which
+ * was included above. However <rpc/rpc.h> includes <sys/xti.h> which defines
+ * them again without checking if they already exsist. This generates
+ * two "Redefinition of macro" warnings for every single .c file that is
+ * compiled.
+ */
+#if defined(HPUX) && defined(TCP_NODELAY)
+#undef TCP_NODELAY
+#endif
+#if defined(HPUX) && defined(TCP_MAXSEG)
+#undef TCP_MAXSEG
+#endif
#include <rpc/rpc.h>
#endif
@@ -373,6 +399,19 @@
#include <rpcsvc/ypclnt.h>
#endif
#if defined(HAVE_RPCSVC_YP_PROT_H)
+/*
+ * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in <netinet/tcp.h> which
+ * was included above. However <rpc/rpc.h> includes <sys/xti.h> which defines
+ * them again without checking if they already exsist. This generates
+ * two "Redefinition of macro" warnings for every single .c file that is
+ * compiled.
+ */
+#if defined(HPUX) && defined(TCP_NODELAY)
+#undef TCP_NODELAY
+#endif
+#if defined(HPUX) && defined(TCP_MAXSEG)
+#undef TCP_MAXSEG
+#endif
#include <rpcsvc/yp_prot.h>
#endif
#endif /* HAVE_NETGROUP */