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/user32/clipboard.cpp

    r21573 r21916  
    276276                do { } while(0)
    277277#endif
     278extern "C" {
    278279UINT WIN32API   clipboardPMToOdinFormat(ULONG ulPMFormat);
    279280ULONG WIN32API  clipboardOdinToPMFormat(UINT uOdinFormat);
     281}
    280282static ULONG    clipboardAddDynFormat(UINT uFormat, const char *pszFormatName);
    281283static BOOL     clipboardIsRWOwner(void);
    … …  
    321323 * @param   ulPMFormat  PM Clipboard format number.
    322324 */
    323 UINT       clipboardPMToOdinFormat(ULONG ulPMFormat)
     325UINT WIN32API clipboardPMToOdinFormat(ULONG ulPMFormat)
    324326{
    325327    for (int i = 0; i < sizeof(gaFormats) / sizeof(gaFormats[0]); i++)
    … …  
    377379 * @todo    serialize this!
    378380 */
    379 ULONG    clipboardAddDynFormat(UINT uFormat, const char *pszFormatName)
     381ULONG clipboardAddDynFormat(UINT uFormat, const char *pszFormatName)
    380382{
    381383    char szFormat[64];
    … …  
    432434 * @param   ulPMFormat  PM Clipboard format number.
    433435 */
    434 ULONG       clipboardOdinToPMFormat(UINT uOdinFormat)
     436ULONG WIN32API clipboardOdinToPMFormat(UINT uOdinFormat)
    435437{
    436438    if (uOdinFormat == 0)
    … …  
    606608 * @returns Success indicator.
    607609 */
     610extern "C"
    608611BOOL WIN32API InitClipboardFormats(void)
    609612{
Note: See TracChangeset for help on using the changeset viewer.