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

    r21358 r21916  
    3131#include "misc.h"
    3232#include "winmm.h"
    33 #include "initwinmm.h"
     33#include "initterm.h"
    3434
    3535#define DBG_LOCALLOG    DBG_waveout
    … …  
    315315MMRESULT WINAPI waveOutGetErrorTextA(MMRESULT wError, LPSTR lpText, UINT cchText)
    316316{
    317     char * theMsg = getWinmmMsg( wError );
     317    const char * theMsg = getWinmmMsg( wError );
    318318    if(theMsg) {
    319319        strncpy( lpText, theMsg, cchText );
    … …  
    331331MMRESULT WINAPI waveOutGetErrorTextW(MMRESULT wError, LPWSTR lpText, UINT cchText)
    332332{
    333     char * theMsg = getWinmmMsg( wError );
     333    const char * theMsg = getWinmmMsg( wError );
    334334    if(theMsg) {
    335335        AsciiToUnicodeN( theMsg, lpText, cchText );
Note: See TracChangeset for help on using the changeset viewer.