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

    r10251 r21916  
    2121#include <misc.h>
    2222
     23#ifdef __GNUC__
     24#include <alloca.h>
     25#endif
     26
    2327#define DBG_LOCALLOG    DBG_atom
    2428#include "dbglocal.h"
    … …  
    2933#define LOOKUP_DELETE   2
    3034#define LOOKUP_NOCASE   0x80000000
     35
     36extern "C" {
    3137
    3238ATOM APIENTRY LookupAtom(HATOMTBL hAtomTbl, PSZ psz, ULONG actionMask);
    … …  
    355361//******************************************************************************
    356362//******************************************************************************
     363
     364} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.