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/kernel32/network.cpp

    r7603 r21916  
    1919#define DBG_LOCALLOG    DBG_network
    2020#include "dbglocal.h"
     21
     22extern "C" {
    2123
    2224//******************************************************************************
    … …  
    6769//******************************************************************************
    6870//******************************************************************************
     71
     72} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.