From e59310522997f4c0cc43d1cc4e42e7c625ba4f71 Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Fri, 26 Nov 2004 07:24:17 +0000
Subject: [PATCH] Fixed ws2_32 for __USE_W32API and dnsapi.

svn path=/trunk/; revision=11819
---
 reactos/lib/ws2_32/makefile  | 5 ++---
 reactos/lib/ws2_32/misc/ns.c | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/reactos/lib/ws2_32/makefile b/reactos/lib/ws2_32/makefile
index c9060038f97..0ea6d263875 100644
--- a/reactos/lib/ws2_32/makefile
+++ b/reactos/lib/ws2_32/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.19 2004/11/25 23:32:53 arty Exp $
+# $Id: makefile,v 1.20 2004/11/26 07:24:17 arty Exp $
 
 PATH_TO_TOP = ../..
 
@@ -29,8 +29,7 @@ TARGET_LFLAGS = -nostartfiles -nostdlib
 
 TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a dnsapi.a
 
-TARGET_OBJECTS = \
-  misc/bsd.o misc/catalog.o misc/dllmain.o \
+TARGET_OBJECTS = misc/bsd.o misc/catalog.o misc/dllmain.o \
   misc/event.o misc/handle.o misc/ns.o \
   misc/sndrcv.o misc/stubs.o misc/upcall.o
 
diff --git a/reactos/lib/ws2_32/misc/ns.c b/reactos/lib/ws2_32/misc/ns.c
index 7487d21f677..055b384c643 100644
--- a/reactos/lib/ws2_32/misc/ns.c
+++ b/reactos/lib/ws2_32/misc/ns.c
@@ -488,7 +488,7 @@ gethostbyname(
   char* found = 0;
   DNS_STATUS dns_status = {0};
   /* include/WinDNS.h -- look up DNS_RECORD on MSDN */
-  PDNS_RECORDA dp = 0;
+  PDNS_RECORD dp = 0;
 
   addr = GH_INVALID;
 
@@ -554,7 +554,7 @@ gethostbyname(
       if(dns_status == 0) {
 	//ASSERT(dp->wType == DNS_TYPE_A);
 	//ASSERT(dp->wDataLength == sizeof(DNS_A_DATA));
-	PDNS_RECORDA curr;
+	PDNS_RECORD curr;
 	for(curr=dp;
 	    curr != NULL && curr->wType != DNS_TYPE_A;
 	    curr = curr->pNext ) { 
@@ -565,7 +565,7 @@ gethostbyname(
 	if(curr) {
 	  WS_DbgPrint(MID_TRACE,("populating hostent\n"));
 	  WS_DbgPrint(MID_TRACE,("pName is (%s)\n", curr->pName));
-	  populate_hostent(p->Hostent, curr->pName, curr->Data.A);
+	  populate_hostent(p->Hostent, (PCHAR)curr->pName, curr->Data.A);
 	  DnsRecordListFree(dp, DnsFreeRecordList);
 	  return p->Hostent;
 	} else {