Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/iphlpapi/iphlpapi.cpp

    r21563 r21916  
    6060
    6161//We don't want to use the OS2 version directly, but the one in wsock32
    62 int WIN32API ODIN_gethostname (char * name, int namelen);
     62int WIN32API OS2gethostname (char * name, int namelen);
    6363
    6464ODINDEBUGCHANNEL(IPHLPAPI-IPHLPAPI)
    … …  
    274274        // fill pipAdapter->IpAddressList
    275275        int cIfAddresses = 0;
    276         for (int j = 0; j < cAddresses; ++j)
     276        int j;
     277        for (j = 0; j < cAddresses; ++j)
    277278        {
    278279#ifdef DEBUG
    … …  
    580581  memset(pFixedInfo,0,memNeeded);
    581582
    582   ODIN_gethostname(fi->HostName,128);
     583  OS2gethostname(fi->HostName,128);
    583584  strcpy(fi->DomainName,_res.defdname);
    584585
Note: See TracChangeset for help on using the changeset viewer.