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

    r21358 r21916  
    3131#include "misc.h"
    3232#include "waveoutflash.h"
    33 #include "initwinmm.h"
     33#include "initterm.h"
    3434
    3535#define DBG_LOCALLOG    DBG_waveoutflash
    … …  
    338338    MCI_BUFFER_PARMS  BufferParms;
    339339
    340     dprintf((__FUNCTION__" - bufsize= %d", dartBufSize));
     340    dprintf(("$ - bufsize= %d", __FUNCTION__, dartBufSize));
    341341
    342342    // Set up the BufferParms data structure and
    … …  
    763763// Displays the text associated with an MCI error code.
    764764
    765 void FlashWaveOut::mciError(char * msg, ULONG rc)
     765void FlashWaveOut::mciError(const char * msg, ULONG rc)
    766766{
    767767#ifdef DEBUG
Note: See TracChangeset for help on using the changeset viewer.