diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-07 04:52:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:48 -0500 |
| commit | 820492ba79aba44ab35dd7af7c0e8cafab61f114 (patch) | |
| tree | 71151efb0c94a090cde55928e9b2ee4187942c2a /source4/heimdal_build/krb5-types.h | |
| parent | 4262be2e45a6d8c52fec909daa4efc18551206fc (diff) | |
| download | samba-820492ba79aba44ab35dd7af7c0e8cafab61f114.tar.gz samba-820492ba79aba44ab35dd7af7c0e8cafab61f114.tar.bz2 samba-820492ba79aba44ab35dd7af7c0e8cafab61f114.zip | |
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)
Diffstat (limited to 'source4/heimdal_build/krb5-types.h')
| -rw-r--r-- | source4/heimdal_build/krb5-types.h | 20 |
1 files changed, 8 insertions, 12 deletions
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 <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__ */ |