Changeset 8927 for trunk/src

Timestamp:

Jul 26, 2002, 7:18:30 PM (23 years ago)

Author:

sandervl

Message:

Use gethostname from wsock32, not the OS/2 version

Location:

trunk/src/iphlpapi

Files:

• iphlpapi.cpp (modified) (3 diffs)
• iphlpapi.def (modified) (2 diffs)
• makefile (modified) (2 diffs)

trunk/src/iphlpapi/iphlpapi.cpp

@@ -1 @@
-/* $Id: iphlpapi.cpp,v 1.8 2002-04-28 15:46:31 sandervl Exp $ */
+/* $Id: iphlpapi.cpp,v 1.9 2002-07-26 17:18:29 sandervl Exp $ */
 /*
  *      IPHLPAPI library
@@ -73 +73 @@
 
 #pragma pack()
+
+//We don't want to use the OS2 version directly, but the one in wsock32
+int WIN32API ODIN_gethostname (char * name, int namelen);
 
 ODINDEBUGCHANNEL(IPHLPAPI-IPHLPAPI)
@@ -453 +456 @@
   memset(pFixedInfo,0,memNeeded);
   
-  gethostname(fi->HostName,128);
+  ODIN_gethostname(fi->HostName,128);
   strcpy(fi->DomainName,_res.defdname);
 

trunk/src/iphlpapi/iphlpapi.def

@@ -1 @@
-; $Id: iphlpapi.def,v 1.1 2001-05-24 17:35:34 sandervl Exp $
+; $Id: iphlpapi.def,v 1.2 2002-07-26 17:18:30 sandervl Exp $
 
 LIBRARY IPHLPAPI INITINSTANCE
@@ -8 +8 @@
  GetAdaptersInfo  = _GetAdaptersInfo@8                    @17
  GetNetworkParams = _GetNetworkParams@8                   @38
+
+;to tell the linker to look elsewhere for this function
+ _ODIN_gethostname@8 = _gethostname@8                     @50
+

trunk/src/iphlpapi/makefile

@@ -1 @@
-# $Id: makefile,v 1.3 2002-02-20 11:57:31 sandervl Exp $
+# $Id: makefile,v 1.4 2002-07-26 17:18:30 sandervl Exp $
 
 #
@@ -33 +33 @@
 so32dll.lib \
 tcp32dll.lib \
+$(ODIN32_LIB)/wsock32.lib \
 $(RTLLIB_O)