diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-08-27 16:14:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:53 -0500 |
| commit | b05cac3cb5b35fa305f3d881012cc8e7eca87bd8 (patch) | |
| tree | 9faba0f3ed723d9f635ce02494700553ebd7bc90 /source/libaddns | |
| parent | ac7087a6516fa7e0d10523a892acae852a80e29e (diff) | |
| download | samba-b05cac3cb5b35fa305f3d881012cc8e7eca87bd8.tar.gz samba-b05cac3cb5b35fa305f3d881012cc8e7eca87bd8.tar.xz samba-b05cac3cb5b35fa305f3d881012cc8e7eca87bd8.zip | |
r17851: Fix a warning & attempt to fix the Tru64 build
Diffstat (limited to 'source/libaddns')
| -rw-r--r-- | source/libaddns/dns.h | 24 | ||||
| -rw-r--r-- | source/libaddns/dnssock.c | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/source/libaddns/dns.h b/source/libaddns/dns.h index a95183a2185..ed12966d7d7 100644 --- a/source/libaddns/dns.h +++ b/source/libaddns/dns.h @@ -50,6 +50,30 @@ #include <krb5.h> #endif +#ifdef HAVE_INTTYPES_H +#include <inttypes.h> + +#ifndef int16 +#define int16 int16_t +#endif + +#ifndef uint16 +#define uint16 uint16_t +#endif + +#ifndef int32 +#define int32 int32_t +#endif + +#ifndef uint32 +#define uint32 uint32_t +#endif +#endif + +#ifdef HAVE_KRB5_H +#include <krb5.h> +#endif + #if HAVE_GSSAPI_H #include <gssapi.h> #elif HAVE_GSSAPI_GSSAPI_H diff --git a/source/libaddns/dnssock.c b/source/libaddns/dnssock.c index d3223b9bd89..ac66a6d1b4f 100644 --- a/source/libaddns/dnssock.c +++ b/source/libaddns/dnssock.c @@ -238,7 +238,7 @@ static int32 DNSSelect( HANDLE hDNSHandle ) if ( !dwNumSockets ) { #ifndef WIN32 dwError = ETIMEDOUT; -#elif +#else dwError = WSAETIMEDOUT; #endif } |