From 2fa692ee500f0a486f04d9f0cdf6228f68da1888 Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Thu, 5 Feb 2004 16:26:39 +0000
Subject: [PATCH] Small fixes for cross compilation.

svn path=/trunk/; revision=8038
---
 reactos/lib/adns/adns_win32/adns_win32.h | 2 +-
 reactos/lib/adns/adns_win32/timercmp.h   | 2 ++
 reactos/lib/dnsapi/dnsapi/names.c        | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/reactos/lib/adns/adns_win32/adns_win32.h b/reactos/lib/adns/adns_win32/adns_win32.h
index 000bcc36c08..56b2cfe6c43 100644
--- a/reactos/lib/adns/adns_win32/adns_win32.h
+++ b/reactos/lib/adns/adns_win32/adns_win32.h
@@ -74,7 +74,7 @@ extern "C"
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <Winsock2.h>
+#include <winsock2.h>
 #include <windows.h>
 #include <sys/types.h>
 #include <time.h>
diff --git a/reactos/lib/adns/adns_win32/timercmp.h b/reactos/lib/adns/adns_win32/timercmp.h
index 0cf000a75d6..efccc38e772 100644
--- a/reactos/lib/adns/adns_win32/timercmp.h
+++ b/reactos/lib/adns/adns_win32/timercmp.h
@@ -1,6 +1,7 @@
 #ifndef TIMERCMP_H
 #define TIMERCMP_H
 
+#ifndef timercmp
 /* Taken from sys/time.h on linux. */
 # define timercmp(a, b, CMP)                                                  \
   (((a)->tv_sec == (b)->tv_sec) ?                                             \
@@ -8,5 +9,6 @@
    ((a)->tv_sec CMP (b)->tv_sec))
 
 # define timerclear(a) ((a)->tv_sec = (a)->tv_usec = 0)
+#endif
 
 #endif//TIMERCMP_H
diff --git a/reactos/lib/dnsapi/dnsapi/names.c b/reactos/lib/dnsapi/dnsapi/names.c
index 3cb0f161dfa..0cd5f226c71 100644
--- a/reactos/lib/dnsapi/dnsapi/names.c
+++ b/reactos/lib/dnsapi/dnsapi/names.c
@@ -50,7 +50,7 @@ static BOOL DnsIntContainsUnderscore( LPCWSTR Name ) {
  *  If the name contains a non-ascii character.
  */
 
-DNS_STATUS DnsValidateName_W
+DNS_STATUS WINAPI DnsValidateName_W
 ( LPCWSTR Name,
   DNS_NAME_FORMAT Format )  {
   BOOL AllowDot = FALSE;
@@ -136,7 +136,7 @@ DNS_STATUS DnsValidateName_W
   return ERROR_SUCCESS;
 }
 
-DNS_STATUS DnsValidateName_UTF8
+DNS_STATUS WINAPI DnsValidateName_UTF8
 ( LPCSTR Name,
   DNS_NAME_FORMAT Format ) {
   PWCHAR Buffer;
@@ -153,7 +153,7 @@ DNS_STATUS DnsValidateName_UTF8
   return Status;
 }
 
-DNS_STATUS DnsValidateName_A
+DNS_STATUS WINAPI DnsValidateName_A
 ( LPCSTR Name,
   DNS_NAME_FORMAT Format ) {
   return DnsValidateName_UTF8( Name, Format );