mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Use stub types instead of intptr_t

Browse source 
This is so there are at least compiler warnings raised if one of the
pointers mismatch their types.
This commit is contained in:
Misa 2021-09-17 21:11:25 -07:00
parent 1a0e720be8
commit e13d3af2eb
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
desktop_version/src/SteamNetwork.c
View file

@ -26,38 +26,41 @@
/* DLL, Entry Points */ /* DLL, Entry Points */
struct ISteamClient;
struct ISteamUserStats;
#define FUNC_LIST \ #define FUNC_LIST \
FOREACH_FUNC(uint8_t, SteamAPI_Init, (void)) \ FOREACH_FUNC(uint8_t, SteamAPI_Init, (void)) \
FOREACH_FUNC(void, SteamAPI_Shutdown, (void)) \ FOREACH_FUNC(void, SteamAPI_Shutdown, (void)) \
FOREACH_FUNC(void, SteamAPI_RunCallbacks, (void)) \ FOREACH_FUNC(void, SteamAPI_RunCallbacks, (void)) \
FOREACH_FUNC(intptr_t, SteamInternal_CreateInterface, (const char*)) \ FOREACH_FUNC(struct ISteamClient*, SteamInternal_CreateInterface, (const char*)) \
FOREACH_FUNC(int32_t, SteamAPI_GetHSteamUser, (void)) \ FOREACH_FUNC(int32_t, SteamAPI_GetHSteamUser, (void)) \
FOREACH_FUNC(int32_t, SteamAPI_GetHSteamPipe, (void)) \ FOREACH_FUNC(int32_t, SteamAPI_GetHSteamPipe, (void)) \
FOREACH_FUNC(intptr_t, SteamAPI_ISteamClient_GetISteamUserStats, ( \ FOREACH_FUNC(struct ISteamUserStats*, SteamAPI_ISteamClient_GetISteamUserStats, ( \
intptr_t, \ struct ISteamClient*, \
int32_t, \ int32_t, \
int32_t, \ int32_t, \
const char* \ const char* \
)) \ )) \
FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_RequestCurrentStats, (intptr_t)) \ FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_RequestCurrentStats, (struct ISteamUserStats*)) \
FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_StoreStats, (intptr_t)) \ FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_StoreStats, (struct ISteamUserStats*)) \
FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_GetStat, ( \ FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_GetStat, ( \
intptr_t, \ struct ISteamUserStats*, \
const char*, \ const char*, \
int32_t* \ int32_t* \
)) \ )) \
FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_SetStat, ( \ FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_SetStat, ( \
intptr_t, \ struct ISteamUserStats*, \
const char*, \ const char*, \
int32_t \ int32_t \
)) \ )) \
FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_SetAchievement, ( \ FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_SetAchievement, ( \
intptr_t, \ struct ISteamUserStats*, \
const char* \ const char* \
)) ))
static void *libHandle = NULL; static void *libHandle = NULL;
static intptr_t steamUserStats = (intptr_t) NULL; static struct ISteamUserStats *steamUserStats = NULL;
#define FOREACH_FUNC(rettype, name, params) static rettype (*name) params = NULL; #define FOREACH_FUNC(rettype, name, params) static rettype (*name) params = NULL;
FUNC_LIST FUNC_LIST
@ -69,7 +72,7 @@ static void ClearPointers(void)
{ {
SDL_UnloadObject(libHandle); SDL_UnloadObject(libHandle);
libHandle = NULL; libHandle = NULL;
steamUserStats = (intptr_t) NULL; steamUserStats = NULL;
#define FOREACH_FUNC(rettype, name, params) name = NULL; #define FOREACH_FUNC(rettype, name, params) name = NULL;
FUNC_LIST FUNC_LIST
#undef FOREACH_FUNC #undef FOREACH_FUNC
@ -82,7 +85,7 @@ int32_t STEAM_init(void)
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__) #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__)
return 0; return 0;
#endif #endif
intptr_t steamClient; struct ISteamClient *steamClient;
int32_t steamUser, steamPipe; int32_t steamUser, steamPipe;
libHandle = SDL_LoadObject(STEAM_LIBRARY); libHandle = SDL_LoadObject(STEAM_LIBRARY);