From 3a0fd53f7c3cfa9ce26f9f4b1da4a1ac1dc4e44a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 11 Jun 2019 14:44:14 +0200 Subject: [PATCH] lib/replace: Remove #undef TCP_NODELAY A duplicate define warning is better than not defining this at all. Similar to a patch Torsten Werner submitted to the Samba Bugzilla in 2005. Not tested on HP-UX reverts fc84e916f628b4fb6f6667ad45d0ced0e9134b23 that was still present in the new copy of nis.h created in c29d087e1ea4c92717ef86e372fe80f410580fdc BUG: https://bugzilla.samba.org/show_bug.cgi?id=2406 BUG: https://bugzilla.samba.org/show_bug.cgi?id=2140 Signed-off-by: Andrew Bartlett Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Tue Jun 18 06:47:05 UTC 2019 on sn-devel-184 --- lib/replace/system/nis.h | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/lib/replace/system/nis.h b/lib/replace/system/nis.h index 068595a1628..7213b1550b3 100644 --- a/lib/replace/system/nis.h +++ b/lib/replace/system/nis.h @@ -33,20 +33,6 @@ #if defined(HAVE_SYS_SECURITY_H) && defined(HAVE_RPC_AUTH_ERROR_CONFLICT) #undef AUTH_ERROR #endif /* HAVE_SYS_SECURITY_H && HAVE_RPC_AUTH_ERROR_CONFLICT */ -/* - * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in which - * was included above. However includes 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 /* HPUX && TCP_NODELAY */ - -#if defined(HPUX) && defined(TCP_MAXSEG) -#undef TCP_MAXSEG -#endif /* HPUX && TCP_MAXSEG */ #include #endif /* HAVE_RPC_RPC_H */ @@ -55,20 +41,6 @@ #if defined (HAVE_NETGROUP) #if defined(HAVE_RPCSVC_YP_PROT_H) -/* - * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in which - * was included above. However includes 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 /* HPUX && TCP_MAXSEG */ - -#if defined(HPUX) && defined(TCP_MAXSEG) -#undef TCP_MAXSEG -#endif /* HPUX && TCP_MAXSEG */ #include -- 2.47.3