Changeset 21865 for branches/gcc-kmk/src/iphlpapi

Timestamp:

Dec 8, 2011, 2:32:54 PM (14 years ago)

Author:

dmik

Message:

Port WSOCK32 and IPHLPAPI to GCC/kBuild.

Location:

branches/gcc-kmk/src/iphlpapi

Files:

• Makefile.kmk (added)
• iphlpapi.cpp (modified) (3 diffs)
• iphlpapi.def (modified) (1 diff)
• iphlwrap.h (modified) (2 diffs)

branches/gcc-kmk/src/iphlpapi/iphlpapi.cpp

@@ -60 +60 @@
 
 //We don't want to use the OS2 version directly, but the one in wsock32
-int WIN32API ODIN_gethostname (char * name, int namelen);
+int WIN32API OS2gethostname (char * name, int namelen);
 
 ODINDEBUGCHANNEL(IPHLPAPI-IPHLPAPI)
@@ -274 +274 @@
         // fill pipAdapter->IpAddressList
         int cIfAddresses = 0;
-        for (int j = 0; j < cAddresses; ++j)
+        int j;
+        for (j = 0; j < cAddresses; ++j)
         {
 #ifdef DEBUG
@@ -580 +581 @@
   memset(pFixedInfo,0,memNeeded);
 
-  ODIN_gethostname(fi->HostName,128);
+  OS2gethostname(fi->HostName,128);
   strcpy(fi->DomainName,_res.defdname);
 

branches/gcc-kmk/src/iphlpapi/iphlpapi.def

@@ -6 +6 @@
 
 EXPORTS
- GetAdaptersInfo    = _GetAdaptersInfo@8                    @17
- GetNetworkParams   = _GetNetworkParams@8                   @38
+ GetAdaptersInfo    = "_GetAdaptersInfo@8"                  @17
+ GetNetworkParams   = "_GetNetworkParams@8"                 @38
 
- GetIpAddrTable     = _GetIpAddrTable@12                    @40
- GetIfTable         = _GetIfTable@12                        @41
- GetFriendlyIfIndex = _GetFriendlyIfIndex@4                 @42
+ GetIpAddrTable     = "_GetIpAddrTable@12"                  @40
+ GetIfTable         = "_GetIfTable@12"                      @41
+ GetFriendlyIfIndex = "_GetFriendlyIfIndex@4"               @42
 
-;to tell the linker to look elsewhere for this function
- _ODIN_gethostname@8 = _gethostname@8                     @50
-

branches/gcc-kmk/src/iphlpapi/iphlwrap.h

@@ -8 +8 @@
 #include <netinet/tcp.h>
 #include <nerrno.h>
-
-int _System os2_ioctl (int, unsigned long, char *, int);
 
 inline int _os2_ioctl (int a, unsigned long b, char *c, int d)
@@ -23 +21 @@
 
 #undef  os2_ioctl
-#define os2_ioctl _os2_ioctl
-
-inline int _ioctl(int a, int b, char *c, int d)
-{
- int yyrc;
- USHORT sel = RestoreOS2FS();
-
-    yyrc = ioctl(a, b, c, d);
-    SetFS(sel);
-
-    return yyrc;
-}
-
-#undef  ioctl
-#define ioctl _ioctl
+#define ioctl _os2_ioctl
 
 inline int _res_init(void)