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

    r21324 r21916  
    1515 *****************************************************************************/
    1616#include <os2win.h>
     17#include <string.h>
    1718#include <winnls.h>
    1819#include "unicode.h"
    1920#include "handlemanager.h"
    20 #include <string.h>
    2121
    2222#include "stubs.h"
    … …  
    149149typedef DWORD CALID;
    150150
     151extern "C" {
    151152
    152153/*****************************************************************************
    … …  
    15791580}
    15801581
    1581 
     1582} // extern "C"
     1583
Note: See TracChangeset for help on using the changeset viewer.