moved ubi_ modules back into the ubiqx directory.

[samba.git] / source3 / include / includes.h

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2329553d2344bb5bdca253c762ed54d1dc9f76ae..518f6249e92b0a4e44316b8862632ef7064c6176 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -232,6 +232,7 @@ Here come some platform specific sections
 #define HAVE_MEMMOVE
 #define USE_SIGPROCMASK
 #define USE_WAITPID
+#define USE_SYSV_IPC
 #if 0
 /* SETFS disabled until we can check on some bug reports */
 #if _LINUX_C_LIB_VERSION_MAJOR >= 5
@@ -279,6 +280,7 @@ typedef unsigned short mode_t;
 #ifndef USE_WAITPID
 #define USE_WAITPID
 #endif
+#define USE_SYSV_IPC
 /* SunOS doesn't have POSIX atexit */
 #define atexit on_exit
 #endif
@@ -316,6 +318,15 @@ extern int innetgr (const char *, const char *, const char *, const char *);
 #define USE_STATVFS
 #define USE_GETCWD
 #define USE_SETSID
+#define USE_SYSV_IPC
+
+union semun {
+       int val;
+       struct semid_ds *buf;
+       ushort *array;
+};
+
+
 #ifndef REPLACE_GETPASS
 #define REPLACE_GETPASS
 #endif /* REPLACE_GETPASS */
@@ -340,7 +351,7 @@ char *getwd(char *);
 #define USE_WAITPID
 #endif
 
-#ifdef SGI
+#ifdef SGI4
 #include <netinet/tcp.h>
 #include <sys/statfs.h>
 #include <string.h>
@@ -353,9 +364,10 @@ char *getwd(char *);
 #define USE_WAITPID
 #define USE_DIRECT
 #define USE_SETSID
+#define USE_SYSV_IPC
 #endif
 
-#ifdef SGI5
+#if defined(SGI5) || defined(SGI6)
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 #include <netinet/in_systm.h>
@@ -373,6 +385,7 @@ char *getwd(char *);
 #define USE_STATVFS
 #define USE_WAITPID
 #define USE_SETSID
+#define USE_SYSV_IPC
 #endif
 
 
@@ -429,6 +442,7 @@ extern struct passwd *getpwnam();
 #define USE_STATVFS
 #define USE_GETCWD
 #define USE_SETSID
+#define USE_SYSV_IPC
 #endif
 
 
@@ -454,6 +468,7 @@ char *mktemp(char *); /* No standard include */
 #define PASSWORD_LENGTH 16
 #define NEED_AUTH_PARAMETERS
 #endif  /* OSF1_ENH_SEC */
+#define USE_SYSV_IPC
 #endif
 
 
@@ -562,8 +577,11 @@ char *mktemp(char *); /* No standard include */
 #define USE_GETCWD
 #define USE_SETSID
 #define USE_SETRES
+#define USE_SYSV_IPC
 #define DEFAULT_PRINTING PRINT_HPUX
-#define SIGCLD_IGNORE
+/* Ken Weiss <krweiss@ucdavis.edu> tells us that SIGCLD_IGNORE is
+   not good for HPUX */
+/* #define SIGCLD_IGNORE */
 #endif /* HPUX */
 
 
@@ -673,6 +691,7 @@ char *mktemp(char *); /* No standard include */
 #include <sys/netinet/ip.h>
 #include <dirent.h>
 #include <string.h>
+#include <termios.h>
 #include <fcntl.h>
 #include <sys/statfs.h>
 #include <sys/stropts.h>
@@ -1061,6 +1080,11 @@ struct spwd { /* fake shadow password structure */
 #endif
 #endif
 
+#ifdef USE_SYSV_IPC
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
+#endif
 
 #ifdef AFS_AUTH
 #include <afs/stds.h>
@@ -1101,6 +1125,7 @@ extern char *sys_errlist[];
 #include "version.h"
 #include "smb.h"
 #include "nameserv.h"
+#include "ubiqx/ubi_dLinkList.h"
 #include "proto.h"
 #include "byteorder.h"
 
@@ -1112,15 +1137,15 @@ extern char *sys_errlist[];
 #endif
 
 #ifndef S_ISREG
-#define S_ISREG(x) ((S_IFREG & x)!=0)
+#define S_ISREG(x) ((S_IFREG & (x))!=0)
 #endif
 
 #ifndef S_ISDIR
-#define S_ISDIR(x) ((S_IFDIR & x)!=0)
+#define S_ISDIR(x) ((S_IFDIR & (x))!=0)
 #endif
 
 #if !defined(S_ISLNK) && defined(S_IFLNK)
-#define S_ISLNK(x) ((S_IFLNK & x)!=0)
+#define S_ISLNK(x) ((S_IFLNK & (x))!=0)
 #endif
 
 #ifdef UFC_CRYPT
@@ -1200,7 +1225,7 @@ it works and getting lots of bug reports */
 
 /* this is a rough check to see if this machine has a lstat() call.
    it is not guaranteed to work */
-#if !(defined(S_ISLNK) || defined(S_IFLNK))
+#if !defined(S_ISLNK)
 #define lstat stat
 #endif