From 0c24fcdbfb90198070d1946869229a53afbe6ff1 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Mon, 22 Apr 2013 20:42:14 +1000 Subject: [PATCH] use QDECL instead of __cdecl --- code/cgame/cg_weapons.cpp | 4 ++-- code/renderer/tr_terrain.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/cgame/cg_weapons.cpp b/code/cgame/cg_weapons.cpp index 1473a46..3479d3e 100644 --- a/code/cgame/cg_weapons.cpp +++ b/code/cgame/cg_weapons.cpp @@ -227,11 +227,11 @@ void CG_RegisterWeapon( int weaponNum ) { // give ourselves the functions if we can if (weaponData[weaponNum].func) { - weaponInfo->missileTrailFunc = (void (__cdecl *)(struct centity_s *,const struct weaponInfo_s *))weaponData[weaponNum].func; + weaponInfo->missileTrailFunc = (void (QDECL *)(struct centity_s *,const struct weaponInfo_s *))weaponData[weaponNum].func; } if (weaponData[weaponNum].altfunc) { - weaponInfo->alt_missileTrailFunc = (void (__cdecl *)(struct centity_s *,const struct weaponInfo_s *))weaponData[weaponNum].altfunc; + weaponInfo->alt_missileTrailFunc = (void (QDECL *)(struct centity_s *,const struct weaponInfo_s *))weaponData[weaponNum].altfunc; } switch ( weaponNum ) //extra client only stuff diff --git a/code/renderer/tr_terrain.cpp b/code/renderer/tr_terrain.cpp index bf199ee..33e1c1c 100644 --- a/code/renderer/tr_terrain.cpp +++ b/code/renderer/tr_terrain.cpp @@ -791,7 +791,7 @@ void CTRLandScape::CalculateShaders(void) // Cleanup our temporary array delete[] shaders; - qsort(mSortedPatches, mSortedCount, sizeof(*mSortedPatches), (int (__cdecl *)(const void *,const void *))ComparePatchInfo); + qsort(mSortedPatches, mSortedCount, sizeof(*mSortedPatches), (int (QDECL *)(const void *,const void *))ComparePatchInfo); #endif // PRE_RELEASE_DEMO }