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/include/win/dsound.h

    r21572 r21916  
    181181typedef LPVOID* LPLPVOID;
    182182
    183 typedef BOOL (* CALLBACK LPDSENUMCALLBACKW)(LPGUID,LPWSTR,LPWSTR,LPVOID);
    184 typedef BOOL (* CALLBACK LPDSENUMCALLBACKA)(LPGUID,LPSTR,LPSTR,LPVOID);
     183typedef BOOL (* CALLBACK LPDSENUMCALLBACKW)(LPGUID,LPCWSTR,LPCWSTR,LPVOID);
     184typedef BOOL (* CALLBACK LPDSENUMCALLBACKA)(LPGUID,LPCSTR,LPCSTR,LPVOID);
    185185DECL_WINELIB_TYPE_AW(LPDSENUMCALLBACK)
    186186
Note: See TracChangeset for help on using the changeset viewer.