encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-14 07:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android: fix corresponding warnings

Browse Source
This commit is contained in:
Sylvain Becker
2019-08-30 08:55:20 +02:00
parent 6794ec6670
commit 70dc8d1648
8 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick/android/SDL_sysjoystick.c
View File

@@ -497,7 +497,7 @@ Android_RemoveJoystick(int device_id)
}
static void ANDROID_JoystickDetect();
static void ANDROID_JoystickDetect(void);
static int
ANDROID_JoystickInit(void)

8
src/joystick/controller_type.h
View File

@@ -24,10 +24,6 @@
#pragma once
#endif
#ifndef __cplusplus
#define inline SDL_INLINE
#endif
//-----------------------------------------------------------------------------
// Purpose: Steam Controller models
// WARNING: DO NOT RENUMBER EXISTING VALUES - STORED IN A DATABASE
@@ -65,7 +61,7 @@ typedef enum
k_eControllertype_GenericMouse = 800,
} EControllerType;
#define MAKE_CONTROLLER_ID( nVID, nPID ) (unsigned int)( nVID << 16 | nPID )
#define MAKE_CONTROLLER_ID( nVID, nPID ) (unsigned int)( (unsigned int)nVID << 16 | nPID )
typedef struct
{
unsigned int m_unDeviceID;
@@ -424,7 +420,7 @@ static const ControllerDescription_t arrControllers[] = {
{ MAKE_CONTROLLER_ID( 0x28de, 0x1202 ), k_eControllerType_SteamControllerV2 }, // Valve Bluetooth Steam Controller (HEADCRAB)
};
static inline EControllerType GuessControllerType( int nVID, int nPID )
static SDL_INLINE EControllerType GuessControllerType( int nVID, int nPID )
{
unsigned int unDeviceID = MAKE_CONTROLLER_ID( nVID, nPID );
int iIndex;