[SCM] Samba Shared Repository - branch master updated

Matthieu Patou mat at samba.org
Fri Dec 10 16:35:02 MST 2010


The branch, master has been updated
       via  533ba5a heimdal: unset SLIST_ENTRY only if we are with windows
      from  a1db341 build: cpp is prefixed by CPP=

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 533ba5a919b08a3eb040af7ea980163661b642c7
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Dec 11 01:39:34 2010 +0300

    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 at samba.org>
    Autobuild-Date: Sat Dec 11 00:34:51 CET 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/heimdal/lib/roken/roken-common.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal/lib/roken/roken-common.h b/source4/heimdal/lib/roken/roken-common.h
index d9369a3..6a09da4 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


-- 
Samba Shared Repository


More information about the samba-cvs mailing list