From 8692564e350db4dfa4a9ef4c4cb014d76b284d3b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 2 Nov 2004 04:17:30 +0000
Subject: r3458: more solaris portability fixes, the main one being that we
 can't use a structure element called "open" as its a macro on solaris. (This
 used to be commit 4e92e15c4e396b1d8cd211192888fea68c2cf0f9)

---
 source4/include/includes.h       | 10 ----------
 source4/include/smb_interfaces.h |  2 +-
 source4/include/system/passwd.h  |  4 ++++
 3 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'source4/include')

diff --git a/source4/include/includes.h b/source4/include/includes.h
index dca1824b22..cda7f976c3 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -189,16 +189,6 @@ extern char *sys_errlist[];
 extern int errno;
 #endif
 
-#ifdef HAVE_BROKEN_GETGROUPS
-#define GID_T int
-#else
-#define GID_T gid_t
-#endif
-
-#ifndef NGROUPS_MAX
-#define NGROUPS_MAX 32 /* Guess... */
-#endif
-
 /* Our own pstrings and fstrings */
 #include "pstring.h"
 
diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h
index bdf8282356..c7698bd941 100644
--- a/source4/include/smb_interfaces.h
+++ b/source4/include/smb_interfaces.h
@@ -1128,7 +1128,7 @@ union smb_open {
 			uint32_t size;
 			uint16_t rmode;
 		} out;
-	} open;
+	} openold;
 
 	/* SMBopenX interface */
 	struct {
diff --git a/source4/include/system/passwd.h b/source4/include/system/passwd.h
index 215f53d138..901b1b92f2 100644
--- a/source4/include/system/passwd.h
+++ b/source4/include/system/passwd.h
@@ -64,3 +64,7 @@ int initgroups(char *name,gid_t id);
 #define crypt ufc_crypt
 #endif
 
+
+#ifndef NGROUPS_MAX
+#define NGROUPS_MAX 32 /* Guess... */
+#endif
-- 
cgit