From 2d9bcc861d6b2cd67d7c6439e90d9ac4a600f0f2 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 31 Jan 2011 15:59:06 +1100
Subject: s4:heimdal: import lorikeet-heimdal-201101310455 (commit
 aa88eb1a05c4985cc23fb65fc1bad75bdce01c1f)

---
 source4/heimdal/lib/roken/roken-common.h | 9 +--------
 source4/heimdal/lib/roken/roken.h.in     | 8 +++++++-
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'source4/heimdal/lib/roken')

diff --git a/source4/heimdal/lib/roken/roken-common.h b/source4/heimdal/lib/roken/roken-common.h
index 6a09da40e4..a819d510d0 100644
--- a/source4/heimdal/lib/roken/roken-common.h
+++ b/source4/heimdal/lib/roken/roken-common.h
@@ -148,14 +148,7 @@
 #define MAXPATHLEN (1024+4)
 #endif
 
-#else/* !_WIN32 */
-
-/* Minimize conflict with WinNT.h */
-#ifdef SLIST_ENTRY
-#undef SLIST_ENTRY
-#endif
-
-#endif	/* _WIN32 */
+#endif	/* !_WIN32 */
 
 #ifndef PATH_MAX
 #define PATH_MAX MAX_PATH
diff --git a/source4/heimdal/lib/roken/roken.h.in b/source4/heimdal/lib/roken/roken.h.in
index e7cb1598fb..1ca3c10dc9 100644
--- a/source4/heimdal/lib/roken/roken.h.in
+++ b/source4/heimdal/lib/roken/roken.h.in
@@ -262,12 +262,18 @@ struct sockaddr_dl;
 #endif
 
 #ifndef HAVE_SSIZE_T
+#ifndef SSIZE_T_DEFINED
+#ifdef ssize_t
+#undef ssize_t
+#endif
 #ifdef _WIN64
 typedef __int64 ssize_t;
 #else
 typedef int ssize_t;
 #endif
-#endif
+#define SSIZE_T_DEFINED
+#endif  /* SSIZE_T_DEFINED */
+#endif  /* HAVE_SSIZE_T */
 
 #include <roken-common.h>
 
-- 
cgit