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.h

    r21358 r21916  
    4848          void      writeBuffer();
    4949          void      handler(ULONG ulStatus, PMCI_MIX_BUFFER pBuffer, ULONG ulFlags);
    50           void      mciError(char * msg, ULONG rc);
     50          void      mciError(const char * msg, ULONG rc);
    5151
    5252private:
    … …  
    7070};
    7171
     72LONG APIENTRY FlashWaveOutHandler(ULONG ulStatus, PMCI_MIX_BUFFER pBuffer,
     73                                  ULONG ulFlags);
     74
    7275#endif
    7376
Note: See TracChangeset for help on using the changeset viewer.