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/winmm/mci.cpp

    r10410 r21916  
    157157{
    158158  dprintf(("WINMM:mciGetErrorStringA(%d)\n", mcierr ));
    159   char * theMsg = getWinmmMsg( mcierr );
     159  const char * theMsg = getWinmmMsg( mcierr );
    160160  if ( theMsg )
    161161    strncpy( pszText, theMsg, cchText );
    … …  
    184184{
    185185  dprintf(("WINMM:mciGetErrorStringW(%d)\n", mcierr ));
    186   char * theMsg = getWinmmMsg( mcierr );
     186  const char * theMsg = getWinmmMsg( mcierr );
    187187  if ( theMsg )
    188188    AsciiToUnicodeN( theMsg, pszText, cchText );
Note: See TracChangeset for help on using the changeset viewer.