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/wsock32/wsock32.cpp

    r21456 r21916  
    10391039//******************************************************************************
    10401040//******************************************************************************
    1041 char *debugsockopt(int optname)
     1041const char *debugsockopt(int optname)
    10421042{
    10431043    switch(optname) {
    … …  
    17321732
    17331733                    localhost_address       = *(unsigned long *)&addr->sin_addr;
    1734                     localhost.h_name        = "localhost"; /* This is what the old workaround did. */
     1734                    localhost.h_name        = (char *)"localhost"; /* This is what the old workaround did. */
    17351735                    localhost.h_addrtype    = AF_INET;
    17361736                    localhost.h_length      = 4;
Note: See TracChangeset for help on using the changeset viewer.