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

    r5285 r21916  
    7474};
    7575
     76HRESULT __stdcall PrimBufQueryInterface(THIS, REFIID riid, LPVOID * ppvObj);
     77ULONG   __stdcall PrimBufAddRef(THIS);
     78ULONG   __stdcall PrimBufRelease(THIS);
    7679HRESULT __stdcall PrimBufGetCaps(THIS_ LPDSBCAPS );
    7780HRESULT __stdcall PrimBufGetCurrentPosition(THIS_ LPDWORD,LPDWORD ) ;
Note: See TracChangeset for help on using the changeset viewer.