mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
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 commit is contained in:
parent
93ddf001e3
commit
46b9d6dcb5
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user