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/include/odinwrap.h

    r7357 r21916  
    3737
    3838#ifdef DEBUG
    39 #  define ODINDEBUGCHANNEL(a) static char* pszOdinDebugChannel=#a;
    40 #  define ODINDEBUGCHANNEL1(a) static char* pszOdinDebugChannel1=#a;
     39#  define ODINDEBUGCHANNEL(a) static const char *pszOdinDebugChannel = #a;
     40#  define ODINDEBUGCHANNEL1(a) static const char *pszOdinDebugChannel1 = #a;
    4141#else
    4242#  define ODINDEBUGCHANNEL(a)
    … …  
    6161#include <odin.h>
    6262
     63#ifdef __cplusplus
     64extern "C" {
     65#endif
     66
    6367// ---------------------------------------------------------------------------
    6468#ifdef __WATCOMC__
    … …  
    7175extern void              WIN32API dbg_IncThreadCallDepth(void); // kernel32
    7276extern void              WIN32API dbg_DecThreadCallDepth(void); // kernel32
    73 extern void              WIN32API dbg_ThreadPushCall(char *pszCaller);
     77extern void              WIN32API dbg_ThreadPushCall(const char *pszCaller);
    7478extern void              WIN32API dbg_ThreadPopCall();
    7579extern char*             WIN32API dbg_GetLastCallerName();
    7680
    77 
     81#ifdef __cplusplus
     82} // extern "C"
     83#endif
    7884
    7985// ---------------------------------------------------------------------------
    … …  
    13451351#define ODINPROCEDURE14(cName,t1,a1,t2,a2,t3,a3,t4,a4,t5,a5,t6,a6,t7,a7,t8,a8,t9,a9,t10,a10,t11,a11,t12,a12,t13,a13,t14,a14)  \
    13461352  void WINAPI cName(t1 a1,t2 a2,t3 a3,t4 a4,t5 a5,t6 a6,t7 a7,t8 a8,t9 a9,t10 a10,t11 a11,t12 a12,t13 a13,t14 a14)    \
    1347  
     1353
    13481354#define ODINFUNCTIONNODBG0   ODINFUNCTION0
    13491355#define ODINFUNCTIONNODBG1   ODINFUNCTION1
Note: See TracChangeset for help on using the changeset viewer.