Skip to content

Commit 7108dc0

Browse files
committed
Make usage of MTAEXPORT macro consistent
1 parent 1910304 commit 7108dc0

File tree

7 files changed

+7
-19
lines changed

7 files changed

+7
-19
lines changed

Client/core/CLocalization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void CLocalization::LogCallback( const std::string& str )
136136
//
137137
// Global interface
138138
//
139-
extern "C" _declspec(dllexport) CLocalizationInterface* __cdecl L10n_CreateLocalization ( SString strLocale )
139+
MTAEXPORT CLocalizationInterface* __cdecl L10n_CreateLocalization ( SString strLocale )
140140
{
141141
// Eventually create a localization interface
142142
if ( !g_pLocalization )

Client/game_sa/gamesa_init.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ CCoreInterface* g_pCore = NULL;
2222
// This function uses the initialized data sections of the executables
2323
// to differentiate between versions. MUST be called at least once
2424
// in order for proper initialization to occur.
25-
26-
extern "C" _declspec(dllexport)
27-
CGame * GetGameInterface( CCoreInterface* pCore )
25+
MTAEXPORT CGame * GetGameInterface( CCoreInterface* pCore )
2826
{
2927
DEBUG_TRACE("CGame * GetGameInterface()");
3028

Client/gui/Main.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ int WINAPI DllMain ( HINSTANCE hModule, DWORD dwReason, PVOID pvNothing )
2727
return TRUE;
2828
}
2929

30-
extern "C" _declspec(dllexport)
31-
CGUI* InitGUIInterface ( IDirect3DDevice9* pDevice )
30+
MTAEXPORT CGUI* InitGUIInterface ( IDirect3DDevice9* pDevice )
3231
{
3332
// Create our GUI interface if not already done
3433
if ( !g_pGUI )

Client/loader/Main.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
// 4. By 'MTA San Andreas.exe' during auto-update (in a temporary directory somewhere) (Which may then call it again as admin)
3131
//
3232
///////////////////////////////////////////////////////////////
33-
extern "C" _declspec(dllexport)
34-
int DoWinMain ( HINSTANCE hLauncherInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
33+
MTAEXPORT int DoWinMain ( HINSTANCE hLauncherInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
3534
{
3635
AddUtf8FileHooks();
3736

Client/multiplayer_sa/multiplayersa_init.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ CCoreInterface* g_pCore = NULL;
2525
// to differentiate between versions. MUST be called at least once
2626
// in order for proper initialization to occur.
2727

28-
extern "C" _declspec(dllexport)
29-
CMultiplayer* InitMultiplayerInterface(CCoreInterface* pCore)
28+
MTAEXPORT CMultiplayer* InitMultiplayerInterface(CCoreInterface* pCore)
3029
{
3130
// set the internal pointer to the game class
3231
pGameInterface = pCore->GetGame ();

Shared/XML/XML.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
CXMLImpl* pXMLInterface = NULL;
1616

17-
_DECLSPEC_EX CXML* InitXMLInterface( const char* szSaveFlagDirectory )
17+
MTAEXPORT CXML* InitXMLInterface( const char* szSaveFlagDirectory )
1818
{
1919
// Initialize and do any file recovery as necessary
2020
CXMLFileImpl::InitFileRecovery( szSaveFlagDirectory );
@@ -26,7 +26,7 @@ _DECLSPEC_EX CXML* InitXMLInterface( const char* szSaveFlagDirectory )
2626
return pXMLInterface;
2727
}
2828

29-
_DECLSPEC_EX void ReleaseXMLInterface()
29+
MTAEXPORT void ReleaseXMLInterface()
3030
{
3131
if ( pXMLInterface )
3232
{

Shared/sdk/Common.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,5 @@ struct ElementID
7575
#define MIN_PLAYER_NICK_LENGTH 1
7676
#define MAX_PLAYER_NICK_LENGTH 22
7777

78-
// Windows Specific stuff
79-
#ifdef WIN32
80-
#define _DECLSPEC_EX extern "C" _declspec(dllexport)
81-
#else
82-
#define _DECLSPEC_EX extern "C" __attribute__ ((visibility ("default")))
83-
#endif
84-
8578
// Maximum number of players that can be packed in a single lightweight puresync packet
8679
#define LIGHTSYNC_MAX_PLAYERS 32

0 commit comments

Comments
 (0)