From e795b6116a4d1cd7493624fb745005240680c6d7 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Tue, 1 Jan 2019 03:05:29 +0100 Subject: [PATCH] Make use of atexit() C compatible (#537) --- Source/dthread.h | 2 +- Source/dx.cpp | 2 +- Source/dx.h | 2 +- Source/engine.cpp | 2 +- Source/engine.h | 2 +- Source/fault.cpp | 2 +- Source/fault.h | 2 +- Source/logging.cpp | 2 +- Source/logging.h | 2 +- Source/msgcmd.cpp | 2 +- Source/msgcmd.h | 2 +- Source/nthread.cpp | 2 +- Source/nthread.h | 2 +- types.h | 1 + 14 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Source/dthread.h b/Source/dthread.h index 8d7497ebc..7d0ebc529 100644 --- a/Source/dthread.h +++ b/Source/dthread.h @@ -10,7 +10,7 @@ extern HANDLE sghWorkToDoEvent; // idb void __cdecl dthread_cpp_init_2(); void __cdecl dthread_init_mutex(); void __cdecl dthread_cleanup_mutex_atexit(); -void __cdecl dthread_cleanup_mutex(); +void __cdecl dthread_cleanup_mutex(void); void __fastcall dthread_remove_player(int pnum); void __fastcall dthread_send_delta(int pnum, char cmd, void *pbSrc, int dwLen); void __cdecl dthread_start(); diff --git a/Source/dx.cpp b/Source/dx.cpp index b8d559347..acd12c40d 100644 --- a/Source/dx.cpp +++ b/Source/dx.cpp @@ -35,7 +35,7 @@ void __cdecl dx_cleanup_mutex_atexit() atexit(dx_cleanup_mutex); } -void __cdecl dx_cleanup_mutex() +void __cdecl dx_cleanup_mutex(void) { DeleteCriticalSection(&sgMemCrit); } diff --git a/Source/dx.h b/Source/dx.h index 6c7a7744e..3d5a8da8d 100644 --- a/Source/dx.h +++ b/Source/dx.h @@ -16,7 +16,7 @@ extern HMODULE ghDiabMod; // idb void __cdecl dx_cpp_init_2(); void __cdecl dx_init_mutex(); void __cdecl dx_cleanup_mutex_atexit(); -void __cdecl dx_cleanup_mutex(); +void __cdecl dx_cleanup_mutex(void); void __fastcall dx_init(HWND hWnd); void __cdecl dx_create_back_buffer(); void __cdecl dx_create_primary_surface(); diff --git a/Source/engine.cpp b/Source/engine.cpp index 9f3a377dd..0af35e7c9 100644 --- a/Source/engine.cpp +++ b/Source/engine.cpp @@ -1556,7 +1556,7 @@ void __cdecl mem_atexit_mutex() atexit(mem_free_mutex); } -void __cdecl mem_free_mutex() +void __cdecl mem_free_mutex(void) { DeleteCriticalSection(&sgMemCrit); } diff --git a/Source/engine.h b/Source/engine.h index 9479b1052..bb16f7a07 100644 --- a/Source/engine.h +++ b/Source/engine.h @@ -47,7 +47,7 @@ int __fastcall random(BYTE idx, int v); void __cdecl engine_cpp_init_2(); void __cdecl mem_init_mutex(); void __cdecl mem_atexit_mutex(); -void __cdecl mem_free_mutex(); +void __cdecl mem_free_mutex(void); unsigned char *__fastcall DiabloAllocPtr(int dwBytes); void __fastcall mem_free_dbg(void *p); unsigned char *__fastcall LoadFileInMem(char *pszName, int *pdwFileLen); diff --git a/Source/fault.cpp b/Source/fault.cpp index c0ff74fd9..f005eb1da 100644 --- a/Source/fault.cpp +++ b/Source/fault.cpp @@ -22,7 +22,7 @@ void __cdecl j_exception_init_filter() atexit(exception_init_filter); } -void __cdecl exception_init_filter() +void __cdecl exception_init_filter(void) { exception_set_filter_ptr(); } diff --git a/Source/fault.h b/Source/fault.h index ba88a3d8f..a7aa1e249 100644 --- a/Source/fault.h +++ b/Source/fault.h @@ -13,7 +13,7 @@ extern LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter; // idb void __cdecl exception_cpp_init(); void __cdecl exception_install_filter(); void __cdecl j_exception_init_filter(); -void __cdecl exception_init_filter(); +void __cdecl exception_init_filter(void); LONG __stdcall TopLevelExceptionFilter(PEXCEPTION_POINTERS ExceptionInfo); void __fastcall exception_hex_format(BYTE *ptr, unsigned int numBytes); void __fastcall exception_unknown_module(LPCVOID lpAddress, LPSTR lpModuleName, int iMaxLength, int *sectionNum, int *sectionOffset); diff --git a/Source/logging.cpp b/Source/logging.cpp index 9e66976b0..331e7c44d 100644 --- a/Source/logging.cpp +++ b/Source/logging.cpp @@ -31,7 +31,7 @@ void __cdecl j_log_cleanup_mutex() atexit(log_cleanup_mutex); } -void __cdecl log_cleanup_mutex() +void __cdecl log_cleanup_mutex(void) { DeleteCriticalSection(&sgMemCrit); } diff --git a/Source/logging.h b/Source/logging.h index 2b77ac089..5f96d11f0 100644 --- a/Source/logging.h +++ b/Source/logging.h @@ -10,7 +10,7 @@ extern DWORD nNumberOfBytesToWrite; // idb void __cdecl log_cpp_init_2(); void __cdecl log_init_mutex(); void __cdecl j_log_cleanup_mutex(); -void __cdecl log_cleanup_mutex(); +void __cdecl log_cleanup_mutex(void); void __cdecl log_flush(BOOLEAN force_close); void *__cdecl log_create(); // should be HANDLE void __fastcall log_get_version(VS_FIXEDFILEINFO *file_info); diff --git a/Source/msgcmd.cpp b/Source/msgcmd.cpp index f0aada908..f80def63e 100644 --- a/Source/msgcmd.cpp +++ b/Source/msgcmd.cpp @@ -25,7 +25,7 @@ void __cdecl msgcmd_cleanup_chatcmd_atexit() atexit(msgcmd_cleanup_chatcmd); } -void __cdecl msgcmd_cleanup_chatcmd() +void __cdecl msgcmd_cleanup_chatcmd(void) { msgcmd_cleanup_chatcmd_1(&sgChat_Cmd); msgcmd_cleanup_extern_msg(sgChat_Cmd.extern_msgs); diff --git a/Source/msgcmd.h b/Source/msgcmd.h index 16bc4c00c..d189110b1 100644 --- a/Source/msgcmd.h +++ b/Source/msgcmd.h @@ -8,7 +8,7 @@ extern int sgdwMsgCmdTimer; void __cdecl msgcmd_cpp_init_2(); void __cdecl msgcmd_init_event(); void __cdecl msgcmd_cleanup_chatcmd_atexit(); -void __cdecl msgcmd_cleanup_chatcmd(); +void __cdecl msgcmd_cleanup_chatcmd(void); void __cdecl msgcmd_cmd_cleanup(); void __cdecl msgcmd_send_chat(); BOOLEAN __fastcall msgcmd_add_server_cmd_W(char *chat_message); diff --git a/Source/nthread.cpp b/Source/nthread.cpp index c150f2e59..5124bf448 100644 --- a/Source/nthread.cpp +++ b/Source/nthread.cpp @@ -40,7 +40,7 @@ void __cdecl nthread_cleanup_mutex_atexit() atexit(nthread_cleanup_mutex); } -void __cdecl nthread_cleanup_mutex() +void __cdecl nthread_cleanup_mutex(void) { DeleteCriticalSection(&sgMemCrit); } diff --git a/Source/nthread.h b/Source/nthread.h index cf8bffc39..796b7c999 100644 --- a/Source/nthread.h +++ b/Source/nthread.h @@ -20,7 +20,7 @@ extern int last_tick; // weak void __cdecl nthread_init_mutex(); void __cdecl nthread_cleanup_mutex_atexit(); -void __cdecl nthread_cleanup_mutex(); +void __cdecl nthread_cleanup_mutex(void); void __fastcall nthread_terminate_game(const char *pszFcn); int __fastcall nthread_send_and_recv_turn(int cur_turn, int turn_delta); int __fastcall nthread_recv_turns(int *pfSendAsync); diff --git a/types.h b/types.h index ec2a04e16..4801fcc3b 100644 --- a/types.h +++ b/types.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include