Attachment 1819 Details for Bug 3574 – includes.h patch for 3.0.21c

[patch] includes.h patch for 3.0.21c

include.h_diff (text/plain), 2.95 KB, created by Adrian Tam on 2006-03-22 19:02:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Tam

Created: 2006-03-22 19:02:12 UTC

Size: 2.95 KB

patch

obsolete

>--- includes.h	2006-03-03 16:10:12 -0800
>+++ includes.h.orig	2006-02-20 12:33:22 -0800
>@@ -232,6 +232,10 @@
> 
> #include <sys/file.h>
> 
>+#ifdef HAVE_NETINET_TCP_H
>+#include <netinet/tcp.h>
>+#endif
>+
> /*
>  * The next three defines are needed to access the IPTOS_* options
>  * on some systems.
>@@ -319,6 +323,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
> 
>@@ -371,6 +388,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
> 
>@@ -380,6 +410,19 @@
> 
> #if defined (HAVE_NETGROUP)
> #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
> #if defined(HAVE_RPCSVC_YPCLNT_H)
>@@ -1188,25 +1231,6 @@
> #define MSG_WAITALL 0
> #endif
> 
>-/*
>- * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in <netinet/tcp.h>. 
>- * 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.
>- * So we check if TCP_NODELAY and TCP_MAXSEG are already defined and
>- * undef them before including <netinet/tcp.h>.
>- */
>-#if defined(HPUX) && defined(TCP_NODELAY)
>-#undef TCP_NODELAY
>-#endif
>-#if defined(HPUX) && defined(TCP_MAXSEG)
>-#undef TCP_MAXSEG
>-#endif
>-#ifdef HAVE_NETINET_TCP_H
>-#include <netinet/tcp.h>
>-#endif
>-
> /* default socket options. Dave Miller thinks we should default to TCP_NODELAY
>    given the socket IO pattern that Samba uses */
> #ifdef TCP_NODELAY

Actions: View

Attachments on bug 3574: 1819