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

    r10173 r21916  
    3838*/
    3939
    40 char * getWinmmMsg( MMRESULT result )
    41 {
    42   char * ret;
     40const char * getWinmmMsg( MMRESULT result )
     41{
     42  const char * ret;
    4343  switch ( result )
    4444  {
    … …  
    243243{
    244244  dprintf(("WINMM:midiInGetErrorTextA(%d)\n", wError ));
    245   char * theMsg = getWinmmMsg( wError );
     245  const char * theMsg = getWinmmMsg( wError );
    246246  if ( theMsg )
    247247    strncpy( lpText, theMsg, cchText );
    … …  
    260260{
    261261  dprintf(("WINMM:midiInGetErrorTextW(%d)\n", wError ));
    262   char * theMsg = getWinmmMsg( wError );
     262  const char * theMsg = getWinmmMsg( wError );
    263263  if ( theMsg )
    264264    AsciiToUnicodeN( theMsg, lpText, cchText );
    … …  
    563563{
    564564  dprintf(("WINMM:midiOutGetErrorTextA(%d)\n", wError ));
    565   char * theMsg = getWinmmMsg( wError );
     565  const char * theMsg = getWinmmMsg( wError );
    566566  if ( theMsg )
    567567    strncpy( lpText, theMsg, cchText );
    … …  
    579579{
    580580  dprintf(("WINMM:midiOutGetErrorTextW(%d) - need to translate\n", wError ));
    581   char * theMsg = getWinmmMsg( wError );
     581  const char * theMsg = getWinmmMsg( wError );
    582582  if ( theMsg )
    583583    AsciiToUnicodeN( theMsg, lpText, cchText );
Note: See TracChangeset for help on using the changeset viewer.