Browse Source

Make use of atexit() C compatible (#537)

pull/25/head
Anders Jenbo 7 years ago committed by Robin Eklind
parent
commit
e795b6116a
  1. 2
      Source/dthread.h
  2. 2
      Source/dx.cpp
  3. 2
      Source/dx.h
  4. 2
      Source/engine.cpp
  5. 2
      Source/engine.h
  6. 2
      Source/fault.cpp
  7. 2
      Source/fault.h
  8. 2
      Source/logging.cpp
  9. 2
      Source/logging.h
  10. 2
      Source/msgcmd.cpp
  11. 2
      Source/msgcmd.h
  12. 2
      Source/nthread.cpp
  13. 2
      Source/nthread.h
  14. 1
      types.h

2
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();

2
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);
}

2
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();

2
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);
}

2
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);

2
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();
}

2
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);

2
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);
}

2
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);

2
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);

2
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);

2
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);
}

2
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);

1
types.h

@ -10,6 +10,7 @@
#include <windows.h>
#include <mmsystem.h>
#include <stdio.h>
#include <stdlib.h>
#include <ddraw.h>
#include <dsound.h>
#include <io.h>

Loading…
Cancel
Save