diff options
| author | Andrew Tridgell <tridge@samba.org> | 1997-10-31 04:51:29 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1997-10-31 04:51:29 +0000 |
| commit | 30c046901beb29d1cc3430bfad029ec3a3eaf06c (patch) | |
| tree | 2d80d569ebdd4bb59a739d020e0156293f793f64 | |
| parent | 23c68038b9cc7817e3d90d2b4ae3b97b16f2fa63 (diff) | |
| download | samba-30c046901beb29d1cc3430bfad029ec3a3eaf06c.tar.gz samba-30c046901beb29d1cc3430bfad029ec3a3eaf06c.tar.bz2 samba-30c046901beb29d1cc3430bfad029ec3a3eaf06c.zip | |
OSF1 doesn't define union semun either.
(This used to be commit af7700aa2e3c736f86ae3217a424dfb0910f5f45)
| -rw-r--r-- | source3/include/includes.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 055e633846..92688dd004 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -319,14 +319,7 @@ extern int innetgr (const char *, const char *, const char *, const char *); #define USE_GETCWD #define USE_SETSID #define USE_SYSV_IPC - -union semun { - int val; - struct semid_ds *buf; - ushort *array; -}; - - +#define NO_SEMUN #ifndef REPLACE_GETPASS #define REPLACE_GETPASS #endif /* REPLACE_GETPASS */ @@ -469,6 +462,7 @@ char *mktemp(char *); /* No standard include */ #define NEED_AUTH_PARAMETERS #endif /* OSF1_ENH_SEC */ #define USE_SYSV_IPC +#define NO_SEMUN #endif @@ -1084,6 +1078,13 @@ struct spwd { /* fake shadow password structure */ #include <sys/ipc.h> #include <sys/sem.h> #include <sys/shm.h> +#ifdef NO_SEMUN +union semun { + int val; + struct semid_ds *buf; + unsigned short *array; +}; +#endif #endif #ifdef AFS_AUTH |