Changeset 21927 for trunk/src


Ignore:
Timestamp:
Dec 23, 2011, 7:16:58 PM (14 years ago)
Author:
dmik
Message:

Fix build breaks with the newest GCC 4.4.6 from GIT.

In particular, GCC is now strict about matching the calling convention
of the prototype (argument) and the real function used.

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/initdll/initdll.cpp

    r21916 r21927  
    1515static ULONG moduleHandle = NULLHANDLE;
    1616
    17 static void cleanup(ULONG ulReason)
     17static APIENTRY void cleanup(ULONG ulReason)
    1818{
    1919    cleanupDone = true;

  • trunk/src/kernel32/oslibdebug.cpp

    r21916 r21927  
    8181//******************************************************************************
    8282//******************************************************************************
    83 VOID _Optlink DebugThread(VOID *argpid)
     83VOID DebugThread(VOID *argpid)
    8484{
    8585  BOOL   fTerminate       = FALSE;

  • trunk/src/winmm/joy.cpp

    r8470 r21927  
    3434static BOOL aJoyCaptured[MAXJOYDRIVERS]  = {FALSE,FALSE};
    3535
    36 void _Optlink joySendMessages(void *pData);
     36void joySendMessages(void *pData);
    3737
    3838LONG JoyGetPos(HANDLE hGame, UINT wID, LPJOYINFO lpInfo)
    … …  
    431431// * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
    432432// ***************************************************************************
    433 void _Optlink joySendMessages(void *pData)
     433void joySendMessages(void *pData)
    434434{
    435435  PJOYTHREADOPT      opt = (PJOYTHREADOPT) pData;

  • trunk/src/winmm/midi.cpp

    r21916 r21927  
    833833
    834834
    835 static void _Optlink TimerInHandler(void *);
     835static void TimerInHandler(void *);
    836836
    837837MidiIn * MidiIn::iFirst = NULL;
    … …  
    968968}
    969969
    970 static void _Optlink TimerInHandler(void *vMidiIn)
     970static void TimerInHandler(void *vMidiIn)
    971971{
    972972  unsigned long rc=0;

  • trunk/src/wsock32/asyncthread.cpp

    r21657 r21927  
    3030//******************************************************************************
    3131//******************************************************************************
    32 static void _Optlink AsyncThread(void *arg)
     32static void AsyncThread(void *arg)
    3333{
    3434 PASYNCTHREADPARM pThreadParm = (PASYNCTHREADPARM)arg;
Note: See TracChangeset for help on using the changeset viewer.