diff options
| author | Matthieu Patou <mat@matws.net> | 2010-12-11 01:39:34 +0300 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2010-12-11 00:34:51 +0100 |
| commit | 533ba5a919b08a3eb040af7ea980163661b642c7 (patch) | |
| tree | 5d607c05a072536021fd35d548d5d918a91b6a32 | |
| parent | a1db341e4603cbd605eab7f1d4d4abe246468670 (diff) | |
| download | samba-533ba5a919b08a3eb040af7ea980163661b642c7.tar.gz samba-533ba5a919b08a3eb040af7ea980163661b642c7.tar.xz samba-533ba5a919b08a3eb040af7ea980163661b642c7.zip | |
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 <mat@samba.org>
Autobuild-Date: Sat Dec 11 00:34:51 CET 2010 on sn-devel-104
| -rw-r--r-- | source4/heimdal/lib/roken/roken-common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/heimdal/lib/roken/roken-common.h b/source4/heimdal/lib/roken/roken-common.h index d9369a3e157..6a09da40e45 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 |