From 820492ba79aba44ab35dd7af7c0e8cafab61f114 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 7 Sep 2006 04:52:06 +0000 Subject: r18203: 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 (This used to be commit 84335903ceaf2242e43a0c5464e33408daec44b4) --- source4/heimdal_build/krb5-types.h | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'source4/heimdal_build/krb5-types.h') diff --git a/source4/heimdal_build/krb5-types.h b/source4/heimdal_build/krb5-types.h index 14c4be7974..23bdf15b7f 100644 --- a/source4/heimdal_build/krb5-types.h +++ b/source4/heimdal_build/krb5-types.h @@ -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 -#endif -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_SYS_BITYPES_H -#include -#endif +#include "replace.h" + #ifdef HAVE_SYS_SOCKET_H #include #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__ */ -- cgit