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

    r21358 r21916  
    2828#include "winmm.h"
    2929#include "waveindart.h"
    30 #include "initwinmm.h"
     30#include "initterm.h"
    3131
    3232#define DBG_LOCALLOG    DBG_wavein
    … …  
    281281{
    282282    dprintf(("WINMM:waveInGetErrorTextA(%d)\n", wError ));
    283     char * theMsg = getWinmmMsg( wError );
     283    const char * theMsg = getWinmmMsg( wError );
    284284    if ( theMsg )
    285285        strncpy( lpText, theMsg, cchText );
    … …  
    297297{
    298298    dprintf(("WINMM:waveInGetErrorTextW(%d) - stub\n", wError ));
    299     char * theMsg = getWinmmMsg( wError );
     299    const char * theMsg = getWinmmMsg( wError );
    300300    if ( theMsg )
    301301        AsciiToUnicodeN( theMsg, lpText, cchText );
Note: See TracChangeset for help on using the changeset viewer.