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/irtmidi.hpp

    r5269 r21916  
    8787  unsigned long   hardwareClass() const
    8888                  { return iHardwareClass; };
    89   char *          RCExplanation() const;
     89  const char *    RCExplanation() const;
    9090  static IRTMidi* instance();
    9191  static void     shutdown();
    … …  
    103103
    104104  // Methods for calls to RTMIDI functions
    105   ULONG (*APIENTRY pfnMidiCreateInstance)    ( ULONG, MINSTANCE*, PSZ, ULONG );
     105  ULONG (*APIENTRY pfnMidiCreateInstance)    ( ULONG, MINSTANCE*, PCSZ, ULONG );
    106106  ULONG (*APIENTRY pfnMidiDeleteInstance)    ( MINSTANCE, ULONG );
    107107  ULONG (*APIENTRY pfnMidiEnableInstance)    ( MINSTANCE, ULONG );
    … …  
    119119  ULONG (*APIENTRY pfnMidiTimer)             ( ULONG, ULONG );
    120120
    121   ULONG MidiCreateInstance    ( ULONG, MINSTANCE*, PSZ, ULONG );
     121  ULONG MidiCreateInstance    ( ULONG, MINSTANCE*, PCSZ, ULONG );
    122122  ULONG MidiDeleteInstance    ( MINSTANCE, ULONG );
    123123  ULONG MidiEnableInstance    ( MINSTANCE, ULONG );
Note: See TracChangeset for help on using the changeset viewer.