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

    r10433 r21916  
    2323#include <string.h>
    2424#include <misc.h>
    25 #include <windllbase.h>
     25#include "windllbase.h"
    2626#include <winconst.h>
    2727#include "oslibdebug.h"
    … …  
    4242typedef struct
    4343{
    44     LPSTR pszMsg;
     44    LPCSTR pszMsg;
    4545    UINT msg;
    4646} MSGDESC, *PMSGDESC;
    … …  
    6565INT gcMessages = sizeof(debugMsgs) / sizeof(MSGDESC);
    6666
    67 char *GetDebugMsgText(int Msg)
     67const char *GetDebugMsgText(int Msg)
    6868{
    6969 static char msgtxt[64];
Note: See TracChangeset for help on using the changeset viewer.