summaryrefslogtreecommitdiff
path: root/source4/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-02 04:17:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:16 -0500
commit8692564e350db4dfa4a9ef4c4cb014d76b284d3b (patch)
tree891fbe0b3b55c4b7706bdb6ad8cd85c59cd070e2 /source4/include
parent5011f901aa0140ed60a0b58e80ab0f14810ba432 (diff)
downloadsamba-8692564e350db4dfa4a9ef4c4cb014d76b284d3b.tar.gz
samba-8692564e350db4dfa4a9ef4c4cb014d76b284d3b.tar.bz2
samba-8692564e350db4dfa4a9ef4c4cb014d76b284d3b.zip
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)
Diffstat (limited to 'source4/include')
-rw-r--r--source4/include/includes.h10
-rw-r--r--source4/include/smb_interfaces.h2
-rw-r--r--source4/include/system/passwd.h4
3 files changed, 5 insertions, 11 deletions
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