TONY: Removed old extern, PASCAL, and EXPORT function modifiers

scummvm · May 12, 2012 · 65ec900 · 65ec900
1 parent 435971f
commit 65ec900
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 25 deletions.
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
@@ -816,7 +816,7 @@ static LPITEM GetItemData(uint32 nOrdItem) {
 
 /****************************************************************************\
 *
-* Function:     void PASCAL CustomThread(LPCFCALL p);
+* Function:     void CustomThread(LPCFCALL p);
 *
 * Description:  Thread che richiama una funzione custom. Viene usato negli
 *               script, in modo che ciascuna funzione venga eseguita senza
@@ -848,7 +848,7 @@ void CustomThread(CORO_PARAM, const void *param) {
 
 /****************************************************************************\
 *
-* Function:     void PASCAL ScriptThread(LPMPALSCRIPT s);
+* Function:     void ScriptThread(LPMPALSCRIPT s);
 *
 * Description:  Esegue uno script. Questa funzione e' pensata come starting
 *               point per un thread
@@ -946,7 +946,7 @@ void ScriptThread(CORO_PARAM, const void *param) {
 
 /****************************************************************************\
 *
-* Function:     void PASCAL ActionThread(LPMPALITEM item);
+* Function:     void ActionThread(LPMPALITEM item);
 *
 * Description:  Thread che esegue una azione su un item. Il thread
 *               esegue sempre l'azione 0, per cui e' necessario creare
@@ -1036,7 +1036,7 @@ void ShutUpActionThread(CORO_PARAM, const void *param) {
 
 /****************************************************************************\
 *
-* Function:     void PASCAL LocationPollThread(uint32 id);
+* Function:     void LocationPollThread(uint32 id);
 *
 * Description:  Esegue il polling di una locazione (starting point di un
 *               thread).
@@ -2323,7 +2323,7 @@ uint32 mpalGetError(void) {
 *
 \****************************************************************************/
 
-bool EXPORT mpalExecuteScript(int nScript) {
+bool mpalExecuteScript(int nScript) {
 	int n;
 	LPMPALSCRIPT s;
 
@@ -2355,7 +2355,7 @@ bool EXPORT mpalExecuteScript(int nScript) {
 *
 \****************************************************************************/
 
-void EXPORT mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCus) {
+void mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCus) {
 	lpiifCustom = lpiifCus;
 }
 

diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h
@@ -138,7 +138,6 @@ namespace MPAL {
 
 #define MAXPOLLINGLOCATIONS   64
 
-#define EXPORT
 #define LPSTR char *
 
 /****************************************************************************\
@@ -570,12 +569,9 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
 
 
 /****************************************************************************\
-*       Functions exported DLL
+*       Functions exported to the main game
 \****************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /****************************************************************************\
 *
@@ -593,7 +589,7 @@ extern "C" {
 *
 \****************************************************************************/
 
-bool EXPORT mpalInit(const char *lpszFileName, const char *lpszMprFileName,
+bool mpalInit(const char *lpszFileName, const char *lpszMprFileName,
 					 LPLPCUSTOMFUNCTION lplpcfArray, Common::String *lpcfStrings);
 
 
@@ -636,7 +632,7 @@ void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...);
 *
 \****************************************************************************/
 
-bool EXPORT mpalExecuteScript(int nScript);
+bool mpalExecuteScript(int nScript);
 
 
 
@@ -650,7 +646,7 @@ bool EXPORT mpalExecuteScript(int nScript);
 *
 \****************************************************************************/
 
-uint32 EXPORT mpalGetError(void);
+uint32 mpalGetError(void);
 
 
 
@@ -665,7 +661,7 @@ uint32 EXPORT mpalGetError(void);
 *
 \****************************************************************************/
 
-void EXPORT mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCustom);
+void mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCustom);
 
 
 /****************************************************************************\
@@ -684,7 +680,7 @@ void EXPORT mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCustom);
 *
 \****************************************************************************/
 
-bool EXPORT mpalStartIdlePoll(int nLoc);
+bool mpalStartIdlePoll(int nLoc);
 
 
 /****************************************************************************\
@@ -715,7 +711,7 @@ void mpalEndIdlePoll(CORO_PARAM, int nLoc, bool *result);
 *
 \****************************************************************************/
 
-int EXPORT mpalLoadState(byte *buf);
+int mpalLoadState(byte *buf);
 
 
 
@@ -730,7 +726,7 @@ int EXPORT mpalLoadState(byte *buf);
 *
 \****************************************************************************/
 
-void EXPORT mpalSaveState(byte *buf);
+void mpalSaveState(byte *buf);
 
 
 
@@ -744,11 +740,8 @@ void EXPORT mpalSaveState(byte *buf);
 *
 \****************************************************************************/
 
-int EXPORT mpalGetSaveStateSize(void);
+int mpalGetSaveStateSize(void);
 
-#ifdef __cplusplus
-}
-#endif
 
 /****************************************************************************\
 *

diff --git a/engines/tony/mpal/stubs.h b/engines/tony/mpal/stubs.h
@@ -51,8 +51,6 @@ typedef void (*LPTHREAD_ROUTINE)(void *lpThreadParameter);
 
 #define MB_OK 1
 
-#define PASCAL
-
 /****************************************************************************\
 *       Methods
 \****************************************************************************/

diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
@@ -2069,7 +2069,7 @@ void FPSTREAM::WaitForSync(FPSTREAM *toplay) {
 *
 \****************************************************************************/
 
-void PASCAL FPSTREAM::PlayThread(FPSTREAM *This) {
+void FPSTREAM::PlayThread(FPSTREAM *This) {
 #ifdef REFACTOR_ME
 	byte *lpLockBuf;
 	uint32 dwResult;