Author: tridge Date: 2006-09-07 04:52:06 +0000 (Thu, 07 Sep 2006) New Revision: 18203
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18203 Log: rearranged the overrides in heimdal_build/*.h to avoid the use of heimdal_build/config.h from interfering with libreplace This is a workaround for the fact that with the current CFLAGS and dependencies system, -Iheimdal_build is put at the front of the includes list, which means it overrides the normal config.h Modified: branches/SAMBA_4_0/source/heimdal_build/config.h branches/SAMBA_4_0/source/heimdal_build/krb5-types.h branches/SAMBA_4_0/source/heimdal_build/roken.h Changeset: Modified: branches/SAMBA_4_0/source/heimdal_build/config.h =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/config.h 2006-09-07 04:24:54 UTC (rev 18202) +++ branches/SAMBA_4_0/source/heimdal_build/config.h 2006-09-07 04:52:06 UTC (rev 18203) @@ -4,41 +4,12 @@ */ #ifndef HAVE_HEIMDAL_CONFIG_H -#define HAVE_HEIMDAL_CONFIG_H 1 +#define HAVE_HEIMDAL_CONFIG_H -#include "include/config.h" -#include "replace.h" - #define RCSID(msg) - -#ifdef VOID_RETSIGTYPE -#define SIGRETURN(x) return -#else -#define SIGRETURN(x) return (RETSIGTYPE)(x) -#endif - -/* path to sysconf - should we force this to samba LIBDIR ? */ -#define SYSCONFDIR "/etc" - -/* HDB module dir - set to Samba LIBDIR/hdb ? */ -#define HDBDIR "/usr/heimdal/lib" - -/* Maximum values on all known systems */ -#define MaxHostNameLen (64+4) -#define MaxPathLen (1024+4) - -#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.7rc1"} - -#define VERSION "Samba" - -#define ROKEN_LIB_FUNCTION - -/* these should be done with configure tests */ #define KRB5 -#define GETHOSTBYADDR_PROTO_COMPATIBLE -#define GETSERVBYNAME_PROTO_COMPATIBLE -#define OPENLOG_PROTO_COMPATIBLE -#define GETSOCKNAME_PROTO_COMPATIBLE +#include "include/config.h" +#include "replace.h" #endif Modified: branches/SAMBA_4_0/source/heimdal_build/krb5-types.h =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/krb5-types.h 2006-09-07 04:24:54 UTC (rev 18202) +++ branches/SAMBA_4_0/source/heimdal_build/krb5-types.h 2006-09-07 04:52:06 UTC (rev 18203) @@ -3,19 +3,9 @@ #ifndef __krb5_types_h__ #define __krb5_types_h__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#if HAVE_INTTYPES_H -#include <inttypes.h> -#endif -#if HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#if HAVE_SYS_BITYPES_H -#include <sys/bitypes.h> -#endif +#include "replace.h" + #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -24,4 +14,10 @@ typedef socklen_t krb5_socklen_t; typedef ssize_t krb5_ssize_t; +#ifdef VOID_RETSIGTYPE +#define SIGRETURN(x) return +#else +#define SIGRETURN(x) return (RETSIGTYPE)(x) +#endif + #endif /* __krb5_types_h__ */ Modified: branches/SAMBA_4_0/source/heimdal_build/roken.h =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/roken.h 2006-09-07 04:24:54 UTC (rev 18202) +++ branches/SAMBA_4_0/source/heimdal_build/roken.h 2006-09-07 04:52:06 UTC (rev 18203) @@ -1,10 +1,30 @@ /* - a wrapper to avoid double inclusion of the real roken.h + a wrapper to override some of the defines that the heimdal roken system looks at */ #ifndef _ROKEN_H_ #define _ROKEN_H_ -#include "heimdal_build/config.h" +/* path to sysconf - should we force this to samba LIBDIR ? */ +#define SYSCONFDIR "/etc" + +/* HDB module dir - set to Samba LIBDIR/hdb ? */ +#define HDBDIR "/usr/heimdal/lib" + +/* Maximum values on all known systems */ +#define MaxHostNameLen (64+4) +#define MaxPathLen (1024+4) + +#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.7rc1"} + +#define VERSION "Samba" + +#define ROKEN_LIB_FUNCTION + +#define GETHOSTBYADDR_PROTO_COMPATIBLE +#define GETSERVBYNAME_PROTO_COMPATIBLE +#define OPENLOG_PROTO_COMPATIBLE +#define GETSOCKNAME_PROTO_COMPATIBLE + /* even if we do have dlopen, we don't want heimdal using it */ #undef HAVE_DLOPEN @@ -28,7 +48,5 @@ #define HAVE_SSIZE_T #endif - - #include "heimdal/lib/roken/roken.h" #endif
