From: Matthieu Patou Date: Fri, 10 Dec 2010 22:39:34 +0000 (+0300) Subject: heimdal: unset SLIST_ENTRY only if we are with windows X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=533ba5a919b08a3eb040af7ea980163661b642c7 heimdal: unset SLIST_ENTRY only if we are with windows This is needed because otherwise on some OS like netbsd,openbsd,MacOSX. The preprossessing of ./heimdal/lib/gssapi/mech/cred.h on this plateform is broken because mechqueue.h's definition won't be used as SLIST_HEAD is already defined. The definition occurs when net/if.h is included as it includes sys/queue.h Autobuild-User: Matthieu Patou Autobuild-Date: Sat Dec 11 00:34:51 CET 2010 on sn-devel-104 --- diff --git a/source4/heimdal/lib/roken/roken-common.h b/source4/heimdal/lib/roken/roken-common.h index d9369a3e1576..6a09da40e45b 100644 --- a/source4/heimdal/lib/roken/roken-common.h +++ b/source4/heimdal/lib/roken/roken-common.h @@ -148,13 +148,15 @@ #define MAXPATHLEN (1024+4) #endif -#endif /* !_WIN32 */ +#else/* !_WIN32 */ /* Minimize conflict with WinNT.h */ #ifdef SLIST_ENTRY #undef SLIST_ENTRY #endif +#endif /* _WIN32 */ + #ifndef PATH_MAX #define PATH_MAX MAX_PATH #endif