diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-19 04:15:23 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-19 04:15:23 +0000 |
| commit | e204f1d8a3f54cb6bd8549b15a59af9a525b3392 (patch) | |
| tree | e57217f274885165e8d6c074b11a43c2389830a3 /source3/include/includes.h | |
| parent | 9579b9823707b9acadfd7bf24d1c540eacf53fc0 (diff) | |
| download | samba-e204f1d8a3f54cb6bd8549b15a59af9a525b3392.tar.gz samba-e204f1d8a3f54cb6bd8549b15a59af9a525b3392.tar.xz samba-e204f1d8a3f54cb6bd8549b15a59af9a525b3392.zip | |
Changes to make the default prefix /usr/local/samba - as it was in 1.9.18p10.
acconfig.h configure configure.in include/config.h.in: Fixes to DEC OSF1.
libsmb/nmblib.c: Fixes to nmbd jumps in scope names.
Jeremy.
(This used to be commit 5ad77769be85e6727319afb0f02e5d94c2f9f16f)
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 65 |
1 files changed, 43 insertions, 22 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 26bf8720372..9c5fa95a589 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -294,6 +294,23 @@ #include <sys/capability.h> #endif +#if defined(HAVE_RPC_RPC_H) +#include <rpc/rpc.h> +#endif + +#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined(HAVE_SETNETGRENT) && defined(HAVE_ENDNETGRENT) && defined(HAVE_GETNETGRENT) +#define HAVE_NETGROUP 1 +#endif + +#if defined (HAVE_NETGROUP) +#if defined(HAVE_RPCSVC_YP_PROT_H) +#include <rpcsvc/yp_prot.h> +#endif +#if defined(HAVE_RPCSVC_YPCLNT_H) +#include <rpcsvc/ypclnt.h> +#endif +#endif /* HAVE_NETGROUP */ + #ifndef uchar #define uchar unsigned char #endif @@ -317,7 +334,7 @@ #define uint8 unsigned char #endif -#ifndef int16 +#if !defined(int16) && !defined(HAVE_INT16_FROM_RPC_RPC_H) #if (SIZEOF_SHORT == 4) #define int16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; #else /* SIZEOF_SHORT != 4 */ @@ -325,11 +342,20 @@ #endif /* SIZEOF_SHORT != 4 */ #endif -#ifndef uint16 -#define uint16 unsigned int16 +/* + * Note we duplicate the size tests in the unsigned + * case as int16 may be a typedef from rpc/rpc.h + */ + +#if !defined(uint16) && !defined(HAVE_UINT16_FROM_RPC_RPC_H) +#if (SIZEOF_SHORT == 4) +#define uint16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; +#else /* SIZEOF_SHORT != 4 */ +#define uint16 unsigned short +#endif /* SIZEOF_SHORT != 4 */ #endif -#ifndef int32 +#if !defined(int32) && !defined(HAVE_INT32_FROM_RPC_RPC_H) #if (SIZEOF_INT == 4) #define int32 int #elif (SIZEOF_LONG == 4) @@ -339,8 +365,19 @@ #endif #endif -#ifndef uint32 -#define uint32 unsigned int32 +/* + * Note we duplicate the size tests in the unsigned + * case as int32 may be a typedef from rpc/rpc.h + */ + +#if !defined(uint32) && !defined(HAVE_UINT32_FROM_RPC_RPC_H) +#if (SIZEOF_INT == 4) +#define uint32 unsigned int +#elif (SIZEOF_LONG == 4) +#define uint32 unsigned long +#elif (SIZEOF_SHORT == 4) +#define uint32 unsigned short +#endif #endif /* @@ -594,22 +631,6 @@ union semun { #define HAVE_PAM 1 #endif -#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined(HAVE_SETNETGRENT) && defined(HAVE_ENDNETGRENT) && defined(HAVE_GETNETGRENT) -#define HAVE_NETGROUP 1 -#endif - -#if defined (HAVE_NETGROUP) -#if defined(HAVE_RPC_RPC_H) -#include <rpc/rpc.h> -#endif -#if defined(HAVE_RPCSVC_YP_PROT_H) -#include <rpcsvc/yp_prot.h> -#endif -#if defined(HAVE_RPCSVC_YPCLNT_H) -#include <rpcsvc/ypclnt.h> -#endif -#endif /* HAVE_NETGROUP */ - #ifndef ALLOW_CHANGE_PASSWORD #if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID)) #define ALLOW_CHANGE_PASSWORD 1 |