summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-08-27 16:14:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:53 -0500
commit2868e7f99b42c407fbe1a0fa482e70a436f16315 (patch)
tree1c76e664a8a9a74d812e5cab9b011d6707884a1d
parent5196825b4c620d0c5e2f5893f3e4e57c14a91e8e (diff)
downloadsamba-2868e7f99b42c407fbe1a0fa482e70a436f16315.tar.gz
samba-2868e7f99b42c407fbe1a0fa482e70a436f16315.tar.bz2
samba-2868e7f99b42c407fbe1a0fa482e70a436f16315.zip
r17851: Fix a warning & attempt to fix the Tru64 build
(This used to be commit b05cac3cb5b35fa305f3d881012cc8e7eca87bd8)
-rw-r--r--source3/libaddns/dns.h24
-rw-r--r--source3/libaddns/dnssock.c2
2 files changed, 25 insertions, 1 deletions
diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h
index a95183a218..ed12966d7d 100644
--- a/source3/libaddns/dns.h
+++ b/source3/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/source3/libaddns/dnssock.c b/source3/libaddns/dnssock.c
index d3223b9bd8..ac66a6d1b4 100644
--- a/source3/libaddns/dnssock.c
+++ b/source3/libaddns/dnssock.c
@@ -238,7 +238,7 @@ static int32 DNSSelect( HANDLE hDNSHandle )
if ( !dwNumSockets ) {
#ifndef WIN32
dwError = ETIMEDOUT;
-#elif
+#else
dwError = WSAETIMEDOUT;
#endif
}