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

    r4982 r21916  
    407407static DWORD CDAUDIO_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSA lpParms)
    408408{
    409     LPSTR               str = NULL;
     409    LPCSTR              str = NULL;
    410410    WINE_MCICDAUDIO*    wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
    411411    DWORD               ret = 0;
    … …  
    758758        break;
    759759    default:
    760         TRACE("Seeking to ??=%lu\n", dwFlags);
     760        TRACE("Seeking to #%lu\n", dwFlags);
    761761        return MCIERR_UNSUPPORTED_FUNCTION;
    762762    }
Note: See TracChangeset for help on using the changeset viewer.