Commit in reactos/lib/ws2_32 on MAIN
makefile+2-31.19 -> 1.20
misc/ns.c+3-31.10 -> 1.11
+5-6
2 modified files
Fixed ws2_32 for __USE_W32API and dnsapi.

reactos/lib/ws2_32
makefile 1.19 -> 1.20
diff -u -r1.19 -r1.20
--- makefile	25 Nov 2004 23:32:53 -0000	1.19
+++ makefile	26 Nov 2004 07:24:17 -0000	1.20
@@ -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_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
 

reactos/lib/ws2_32/misc
ns.c 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- ns.c	25 Nov 2004 23:32:54 -0000	1.10
+++ ns.c	26 Nov 2004 07:24:17 -0000	1.11
@@ -488,7 +488,7 @@
   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 @@
       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 @@
 	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 {
CVSspam 0.2.8