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

    r6646 r21916  
    1313 *****************************************************************************/
    1414#include <os2win.h>
     15#include <string.h>
    1516#include <winnls.h>
    1617#include "unicode.h"
    1718#include "handlemanager.h"
    18 #include <string.h>
    1919
    2020#include "stubs.h"
    … …  
    3232 *****************************************************************************/
    3333
    34 
    35 
    3634/*****************************************************************************
    3735 * Prototypes                                                                *
    3836 *****************************************************************************/
     37
     38extern "C" {
    3939
    4040/*****************************************************************************
    … …  
    142142           arg3));
    143143}
     144
     145} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.