Changeset 21927 for trunk/src/winmm

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/winmm

Files:

• joy.cpp (modified) (2 diffs)
• midi.cpp (modified) (2 diffs)

trunk/src/winmm/joy.cpp

@@ -34 +34 @@
 static BOOL aJoyCaptured[MAXJOYDRIVERS]  = {FALSE,FALSE};
 
-void _Optlink joySendMessages(void *pData);
+void joySendMessages(void *pData);
 
 LONG JoyGetPos(HANDLE hGame, UINT wID, LPJOYINFO lpInfo)
@@ -431 +431 @@
 // * Author    : Przemyslaw Dobrowolski [Tue, 1999/06/29 09:00]
 // ***************************************************************************
-void _Optlink joySendMessages(void *pData)
+void joySendMessages(void *pData)
 {
   PJOYTHREADOPT      opt = (PJOYTHREADOPT) pData;

trunk/src/winmm/midi.cpp

@@ -833 +833 @@
 
 
-static void _Optlink TimerInHandler(void *);
+static void TimerInHandler(void *);
 
 MidiIn * MidiIn::iFirst = NULL;
@@ -968 +968 @@
 }
 
-static void _Optlink TimerInHandler(void *vMidiIn)
+static void TimerInHandler(void *vMidiIn)
 {
   unsigned long rc=0;