mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-06-01 06:44:27 +08:00
Fix warning for Android NDK compiler: "function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]"
https://stackoverflow.com/questions/42125/warning-error-function-declaration-isnt-a-prototype In C int foo() and int foo(void) are different functions. int foo() accepts an arbitrary number of arguments, while int foo(void) accepts 0 arguments. In C++ they mean the same thing.
This commit is contained in:
@@ -52,9 +52,9 @@ void spawnTrailFromEmitter(struct particle *emitter);
|
|||||||
void spawnEmitterParticle(GLfloat x, GLfloat y);
|
void spawnEmitterParticle(GLfloat x, GLfloat y);
|
||||||
void explodeEmitter(struct particle *emitter);
|
void explodeEmitter(struct particle *emitter);
|
||||||
void initializeParticles(void);
|
void initializeParticles(void);
|
||||||
void initializeTexture();
|
void initializeTexture(void);
|
||||||
int nextPowerOfTwo(int x);
|
int nextPowerOfTwo(int x);
|
||||||
void drawParticles();
|
void drawParticles(void);
|
||||||
void stepParticles(double deltaTime);
|
void stepParticles(double deltaTime);
|
||||||
|
|
||||||
/* helper function (used in texture loading)
|
/* helper function (used in texture loading)
|
||||||
@@ -159,7 +159,7 @@ stepParticles(double deltaTime)
|
|||||||
This draws all the particles shown on screen
|
This draws all the particles shown on screen
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
drawParticles()
|
drawParticles(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* draw the background */
|
/* draw the background */
|
||||||
@@ -324,7 +324,7 @@ initializeParticles(void)
|
|||||||
loads the particle texture
|
loads the particle texture
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
initializeTexture()
|
initializeTexture(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
int bpp; /* texture bits per pixel */
|
int bpp; /* texture bits per pixel */
|
||||||
|
|||||||
@@ -196,7 +196,7 @@ loadFont(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
draw()
|
draw(void)
|
||||||
{
|
{
|
||||||
SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b, bg_color.a);
|
SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b, bg_color.a);
|
||||||
SDL_RenderClear(renderer);
|
SDL_RenderClear(renderer);
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ static struct
|
|||||||
|
|
||||||
#undef SDL_ARTS_SYM
|
#undef SDL_ARTS_SYM
|
||||||
|
|
||||||
static void UnloadARTSLibrary()
|
static void UnloadARTSLibrary(void)
|
||||||
{
|
{
|
||||||
if (arts_handle) {
|
if (arts_handle) {
|
||||||
SDL_UnloadObject(arts_handle);
|
SDL_UnloadObject(arts_handle);
|
||||||
@@ -119,7 +119,7 @@ static int LoadARTSLibrary(void)
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
static void UnloadARTSLibrary()
|
static void UnloadARTSLibrary(void)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ static struct
|
|||||||
|
|
||||||
#undef SDL_ESD_SYM
|
#undef SDL_ESD_SYM
|
||||||
|
|
||||||
static void UnloadESDLibrary()
|
static void UnloadESDLibrary(void)
|
||||||
{
|
{
|
||||||
if (esd_handle) {
|
if (esd_handle) {
|
||||||
SDL_UnloadObject(esd_handle);
|
SDL_UnloadObject(esd_handle);
|
||||||
@@ -96,7 +96,7 @@ static int LoadESDLibrary(void)
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
static void UnloadESDLibrary()
|
static void UnloadESDLibrary(void)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ static struct
|
|||||||
|
|
||||||
#undef SDL_FS_SYM
|
#undef SDL_FS_SYM
|
||||||
|
|
||||||
static void UnloadFusionSoundLibrary()
|
static void UnloadFusionSoundLibrary(void)
|
||||||
{
|
{
|
||||||
if (fs_handle) {
|
if (fs_handle) {
|
||||||
SDL_UnloadObject(fs_handle);
|
SDL_UnloadObject(fs_handle);
|
||||||
@@ -110,7 +110,7 @@ static int LoadFusionSoundLibrary(void)
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
static void UnloadFusionSoundLibrary()
|
static void UnloadFusionSoundLibrary(void)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -142,13 +142,13 @@ static int pipewire_dlsym(const char *fn, void **addr)
|
|||||||
return -1; \
|
return -1; \
|
||||||
}
|
}
|
||||||
|
|
||||||
static int load_pipewire_library()
|
static int load_pipewire_library(void)
|
||||||
{
|
{
|
||||||
pipewire_handle = SDL_LoadObject(pipewire_library);
|
pipewire_handle = SDL_LoadObject(pipewire_library);
|
||||||
return pipewire_handle ? 0 : -1;
|
return pipewire_handle ? 0 : -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void unload_pipewire_library()
|
static void unload_pipewire_library(void)
|
||||||
{
|
{
|
||||||
if (pipewire_handle) {
|
if (pipewire_handle) {
|
||||||
SDL_UnloadObject(pipewire_handle);
|
SDL_UnloadObject(pipewire_handle);
|
||||||
@@ -160,18 +160,18 @@ static void unload_pipewire_library()
|
|||||||
|
|
||||||
#define SDL_PIPEWIRE_SYM(x) PIPEWIRE_##x = x
|
#define SDL_PIPEWIRE_SYM(x) PIPEWIRE_##x = x
|
||||||
|
|
||||||
static int load_pipewire_library()
|
static int load_pipewire_library(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void unload_pipewire_library()
|
static void unload_pipewire_library(void)
|
||||||
{ /* Nothing to do */
|
{ /* Nothing to do */
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC */
|
#endif /* SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC */
|
||||||
|
|
||||||
static int load_pipewire_syms()
|
static int load_pipewire_syms(void)
|
||||||
{
|
{
|
||||||
SDL_PIPEWIRE_SYM(pw_get_library_version);
|
SDL_PIPEWIRE_SYM(pw_get_library_version);
|
||||||
SDL_PIPEWIRE_SYM(pw_init);
|
SDL_PIPEWIRE_SYM(pw_init);
|
||||||
@@ -212,7 +212,7 @@ SDL_FORCE_INLINE SDL_bool pipewire_version_at_least(int major, int minor, int pa
|
|||||||
(pipewire_version_major > major || pipewire_version_minor > minor || pipewire_version_patch >= patch);
|
(pipewire_version_major > major || pipewire_version_minor > minor || pipewire_version_patch >= patch);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int init_pipewire_library()
|
static int init_pipewire_library(void)
|
||||||
{
|
{
|
||||||
if (!load_pipewire_library()) {
|
if (!load_pipewire_library()) {
|
||||||
if (!load_pipewire_syms()) {
|
if (!load_pipewire_syms()) {
|
||||||
@@ -234,7 +234,7 @@ static int init_pipewire_library()
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void deinit_pipewire_library()
|
static void deinit_pipewire_library(void)
|
||||||
{
|
{
|
||||||
PIPEWIRE_pw_deinit();
|
PIPEWIRE_pw_deinit();
|
||||||
unload_pipewire_library();
|
unload_pipewire_library();
|
||||||
@@ -340,7 +340,7 @@ static void io_list_remove(Uint32 id)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void io_list_sort()
|
static void io_list_sort(void)
|
||||||
{
|
{
|
||||||
struct io_node *default_sink = NULL, *default_source = NULL;
|
struct io_node *default_sink = NULL, *default_source = NULL;
|
||||||
struct io_node *n, *temp;
|
struct io_node *n, *temp;
|
||||||
@@ -365,7 +365,7 @@ static void io_list_sort()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void io_list_clear()
|
static void io_list_clear(void)
|
||||||
{
|
{
|
||||||
struct io_node *n, *temp;
|
struct io_node *n, *temp;
|
||||||
|
|
||||||
@@ -426,7 +426,7 @@ static void pending_list_remove(Uint32 id)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pending_list_clear()
|
static void pending_list_clear(void)
|
||||||
{
|
{
|
||||||
struct node_object *node, *temp;
|
struct node_object *node, *temp;
|
||||||
|
|
||||||
@@ -751,7 +751,7 @@ static const struct pw_registry_events registry_events = { PW_VERSION_REGISTRY_E
|
|||||||
.global_remove = registry_event_remove_callback };
|
.global_remove = registry_event_remove_callback };
|
||||||
|
|
||||||
/* The hotplug thread */
|
/* The hotplug thread */
|
||||||
static int hotplug_loop_init()
|
static int hotplug_loop_init(void)
|
||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
|
|
||||||
@@ -794,7 +794,7 @@ static int hotplug_loop_init()
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void hotplug_loop_destroy()
|
static void hotplug_loop_destroy(void)
|
||||||
{
|
{
|
||||||
if (hotplug_loop) {
|
if (hotplug_loop) {
|
||||||
PIPEWIRE_pw_thread_loop_stop(hotplug_loop);
|
PIPEWIRE_pw_thread_loop_stop(hotplug_loop);
|
||||||
@@ -836,7 +836,7 @@ static void hotplug_loop_destroy()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void PIPEWIRE_DetectDevices()
|
static void PIPEWIRE_DetectDevices(void)
|
||||||
{
|
{
|
||||||
struct io_node *io;
|
struct io_node *io;
|
||||||
|
|
||||||
@@ -1342,7 +1342,7 @@ failed:
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void PIPEWIRE_Deinitialize()
|
static void PIPEWIRE_Deinitialize(void)
|
||||||
{
|
{
|
||||||
if (pipewire_initialized) {
|
if (pipewire_initialized) {
|
||||||
hotplug_loop_destroy();
|
hotplug_loop_destroy();
|
||||||
|
|||||||
@@ -885,7 +885,7 @@ static int SDLCALL HotplugThread(void *data)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void PULSEAUDIO_DetectDevices()
|
static void PULSEAUDIO_DetectDevices(void)
|
||||||
{
|
{
|
||||||
SDL_sem *ready_sem = SDL_CreateSemaphore(0);
|
SDL_sem *ready_sem = SDL_CreateSemaphore(0);
|
||||||
|
|
||||||
|
|||||||
@@ -842,18 +842,18 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeDropFile)(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Lock / Unlock Mutex */
|
/* Lock / Unlock Mutex */
|
||||||
void Android_ActivityMutex_Lock()
|
void Android_ActivityMutex_Lock(void)
|
||||||
{
|
{
|
||||||
SDL_LockMutex(Android_ActivityMutex);
|
SDL_LockMutex(Android_ActivityMutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Android_ActivityMutex_Unlock()
|
void Android_ActivityMutex_Unlock(void)
|
||||||
{
|
{
|
||||||
SDL_UnlockMutex(Android_ActivityMutex);
|
SDL_UnlockMutex(Android_ActivityMutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Lock the Mutex when the Activity is in its 'Running' state */
|
/* Lock the Mutex when the Activity is in its 'Running' state */
|
||||||
void Android_ActivityMutex_Lock_Running()
|
void Android_ActivityMutex_Lock_Running(void)
|
||||||
{
|
{
|
||||||
int pauseSignaled = 0;
|
int pauseSignaled = 0;
|
||||||
int resumeSignaled = 0;
|
int resumeSignaled = 0;
|
||||||
@@ -1439,13 +1439,13 @@ void Android_JNI_SetOrientation(int w, int h, int resizable, const char *hint)
|
|||||||
(*env)->DeleteLocalRef(env, jhint);
|
(*env)->DeleteLocalRef(env, jhint);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Android_JNI_MinizeWindow()
|
void Android_JNI_MinizeWindow(void)
|
||||||
{
|
{
|
||||||
JNIEnv *env = Android_JNI_GetEnv();
|
JNIEnv *env = Android_JNI_GetEnv();
|
||||||
(*env)->CallStaticVoidMethod(env, mActivityClass, midMinimizeWindow);
|
(*env)->CallStaticVoidMethod(env, mActivityClass, midMinimizeWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_bool Android_JNI_ShouldMinimizeOnFocusLoss()
|
SDL_bool Android_JNI_ShouldMinimizeOnFocusLoss(void)
|
||||||
{
|
{
|
||||||
JNIEnv *env = Android_JNI_GetEnv();
|
JNIEnv *env = Android_JNI_GetEnv();
|
||||||
return (*env)->CallStaticBooleanMethod(env, mActivityClass, midShouldMinimizeOnFocusLoss);
|
return (*env)->CallStaticBooleanMethod(env, mActivityClass, midShouldMinimizeOnFocusLoss);
|
||||||
@@ -1879,7 +1879,7 @@ static SDL_bool Android_JNI_ExceptionOccurred(SDL_bool silent)
|
|||||||
return SDL_FALSE;
|
return SDL_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Internal_Android_Create_AssetManager()
|
static void Internal_Android_Create_AssetManager(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
|
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
|
||||||
@@ -1918,7 +1918,7 @@ static void Internal_Android_Create_AssetManager()
|
|||||||
LocalReferenceHolder_Cleanup(&refs);
|
LocalReferenceHolder_Cleanup(&refs);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Internal_Android_Destroy_AssetManager()
|
static void Internal_Android_Destroy_AssetManager(void)
|
||||||
{
|
{
|
||||||
JNIEnv *env = Android_JNI_GetEnv();
|
JNIEnv *env = Android_JNI_GetEnv();
|
||||||
|
|
||||||
@@ -2153,7 +2153,7 @@ int Android_JNI_GetPowerInfo(int *plugged, int *charged, int *battery, int *seco
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Add all touch devices */
|
/* Add all touch devices */
|
||||||
void Android_JNI_InitTouch()
|
void Android_JNI_InitTouch(void)
|
||||||
{
|
{
|
||||||
JNIEnv *env = Android_JNI_GetEnv();
|
JNIEnv *env = Android_JNI_GetEnv();
|
||||||
(*env)->CallStaticVoidMethod(env, mActivityClass, midInitTouch);
|
(*env)->CallStaticVoidMethod(env, mActivityClass, midInitTouch);
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ static void kbd_cleanup_signal_action(int signum, siginfo_t *info, void *ucontex
|
|||||||
SDL_EVDEV_kbd_reraise_signal(signum);
|
SDL_EVDEV_kbd_reraise_signal(signum);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void kbd_unregister_emerg_cleanup()
|
static void kbd_unregister_emerg_cleanup(void)
|
||||||
{
|
{
|
||||||
int tabidx, signum;
|
int tabidx, signum;
|
||||||
|
|
||||||
|
|||||||
@@ -214,7 +214,7 @@ static void kbd_cleanup_signal_action(int signum, siginfo_t *info, void *ucontex
|
|||||||
SDL_EVDEV_kbd_reraise_signal(signum);
|
SDL_EVDEV_kbd_reraise_signal(signum);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void kbd_unregister_emerg_cleanup()
|
static void kbd_unregister_emerg_cleanup(void)
|
||||||
{
|
{
|
||||||
int tabidx, signum;
|
int tabidx, signum;
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ typedef struct _FcitxClient
|
|||||||
|
|
||||||
static FcitxClient fcitx_client;
|
static FcitxClient fcitx_client;
|
||||||
|
|
||||||
static char *GetAppName()
|
static char *GetAppName(void)
|
||||||
{
|
{
|
||||||
#if defined(__LINUX__) || defined(__FREEBSD__)
|
#if defined(__LINUX__) || defined(__FREEBSD__)
|
||||||
char *spot;
|
char *spot;
|
||||||
@@ -368,7 +368,7 @@ static Uint32 Fcitx_ModState(void)
|
|||||||
return fcitx_mods;
|
return fcitx_mods;
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_bool SDL_Fcitx_Init()
|
SDL_bool SDL_Fcitx_Init(void)
|
||||||
{
|
{
|
||||||
fcitx_client.dbus = SDL_DBus_GetContext();
|
fcitx_client.dbus = SDL_DBus_GetContext();
|
||||||
|
|
||||||
@@ -380,7 +380,7 @@ SDL_bool SDL_Fcitx_Init()
|
|||||||
return FcitxClientCreateIC(&fcitx_client);
|
return FcitxClientCreateIC(&fcitx_client);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDL_Fcitx_Quit()
|
void SDL_Fcitx_Quit(void)
|
||||||
{
|
{
|
||||||
FcitxClientICCallMethod(&fcitx_client, "DestroyIC");
|
FcitxClientICCallMethod(&fcitx_client, "DestroyIC");
|
||||||
if (fcitx_client.ic_path) {
|
if (fcitx_client.ic_path) {
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ static _SDL_IME_ProcessKeyEvent SDL_IME_ProcessKeyEvent_Real = NULL;
|
|||||||
static _SDL_IME_UpdateTextRect SDL_IME_UpdateTextRect_Real = NULL;
|
static _SDL_IME_UpdateTextRect SDL_IME_UpdateTextRect_Real = NULL;
|
||||||
static _SDL_IME_PumpEvents SDL_IME_PumpEvents_Real = NULL;
|
static _SDL_IME_PumpEvents SDL_IME_PumpEvents_Real = NULL;
|
||||||
|
|
||||||
static void InitIME()
|
static void InitIME(void)
|
||||||
{
|
{
|
||||||
static SDL_bool inited = SDL_FALSE;
|
static SDL_bool inited = SDL_FALSE;
|
||||||
#ifdef HAVE_FCITX
|
#ifdef HAVE_FCITX
|
||||||
@@ -142,7 +142,7 @@ void SDL_IME_UpdateTextRect(const SDL_Rect *rect)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDL_IME_PumpEvents()
|
void SDL_IME_PumpEvents(void)
|
||||||
{
|
{
|
||||||
if (SDL_IME_PumpEvents_Real) {
|
if (SDL_IME_PumpEvents_Real) {
|
||||||
SDL_IME_PumpEvents_Real();
|
SDL_IME_PumpEvents_Real();
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ static SDL_bool realtime_portal_supported(DBusConnection *conn)
|
|||||||
"RTTimeUSecMax", DBUS_TYPE_INT64, &res);
|
"RTTimeUSecMax", DBUS_TYPE_INT64, &res);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void set_rtkit_interface()
|
static void set_rtkit_interface(void)
|
||||||
{
|
{
|
||||||
SDL_DBusContext *dbus = SDL_DBus_GetContext();
|
SDL_DBusContext *dbus = SDL_DBus_GetContext();
|
||||||
|
|
||||||
@@ -108,7 +108,7 @@ static DBusConnection *get_rtkit_dbus_connection()
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rtkit_initialize()
|
static void rtkit_initialize(void)
|
||||||
{
|
{
|
||||||
DBusConnection *dbus_conn;
|
DBusConnection *dbus_conn;
|
||||||
|
|
||||||
@@ -134,7 +134,7 @@ static void rtkit_initialize()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static SDL_bool rtkit_initialize_realtime_thread()
|
static SDL_bool rtkit_initialize_realtime_thread(void)
|
||||||
{
|
{
|
||||||
// Following is an excerpt from rtkit README that outlines the requirements
|
// Following is an excerpt from rtkit README that outlines the requirements
|
||||||
// a thread must meet before making rtkit requests:
|
// a thread must meet before making rtkit requests:
|
||||||
|
|||||||
@@ -449,7 +449,7 @@ static SDL_WSCONS_input_data *SDL_WSCONS_Init_Keyboard(const char *dev)
|
|||||||
return input;
|
return input;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDL_WSCONS_Init()
|
void SDL_WSCONS_Init(void)
|
||||||
{
|
{
|
||||||
inputs[0] = SDL_WSCONS_Init_Keyboard("/dev/wskbd0");
|
inputs[0] = SDL_WSCONS_Init_Keyboard("/dev/wskbd0");
|
||||||
inputs[1] = SDL_WSCONS_Init_Keyboard("/dev/wskbd1");
|
inputs[1] = SDL_WSCONS_Init_Keyboard("/dev/wskbd1");
|
||||||
@@ -460,7 +460,7 @@ void SDL_WSCONS_Init()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDL_WSCONS_Quit()
|
void SDL_WSCONS_Quit(void)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
SDL_WSCONS_input_data *input = NULL;
|
SDL_WSCONS_input_data *input = NULL;
|
||||||
@@ -921,7 +921,7 @@ static void updateKeyboard(SDL_WSCONS_input_data *input)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDL_WSCONS_PumpEvents()
|
void SDL_WSCONS_PumpEvents(void)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (i = 0; i < 4; i++) {
|
for (i = 0; i < 4; i++) {
|
||||||
|
|||||||
@@ -1239,7 +1239,7 @@ void SDL_SIMDFree(void *ptr)
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
int main()
|
int main(void)
|
||||||
{
|
{
|
||||||
printf("CPU count: %d\n", SDL_GetCPUCount());
|
printf("CPU count: %d\n", SDL_GetCPUCount());
|
||||||
printf("CPU type: %s\n", SDL_GetCPUType());
|
printf("CPU type: %s\n", SDL_GetCPUType());
|
||||||
|
|||||||
@@ -519,7 +519,7 @@ static struct usb_string_cache_entry *usb_string_cache = NULL;
|
|||||||
static size_t usb_string_cache_size = 0;
|
static size_t usb_string_cache_size = 0;
|
||||||
static size_t usb_string_cache_insert_pos = 0;
|
static size_t usb_string_cache_insert_pos = 0;
|
||||||
|
|
||||||
static int usb_string_cache_grow()
|
static int usb_string_cache_grow(void)
|
||||||
{
|
{
|
||||||
struct usb_string_cache_entry *new_cache;
|
struct usb_string_cache_entry *new_cache;
|
||||||
size_t allocSize;
|
size_t allocSize;
|
||||||
@@ -537,7 +537,7 @@ static int usb_string_cache_grow()
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void usb_string_cache_destroy()
|
static void usb_string_cache_destroy(void)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
for (i = 0; i < usb_string_cache_insert_pos; i++) {
|
for (i = 0; i < usb_string_cache_insert_pos; i++) {
|
||||||
|
|||||||
@@ -504,7 +504,7 @@ int HID_API_EXPORT hid_exit(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void process_pending_events() {
|
static void process_pending_events(void) {
|
||||||
SInt32 res;
|
SInt32 res;
|
||||||
do {
|
do {
|
||||||
res = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.001, FALSE);
|
res = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.001, FALSE);
|
||||||
|
|||||||
@@ -264,7 +264,7 @@ static void register_error(hid_device *device, const char *op)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef HIDAPI_USE_DDK
|
#ifndef HIDAPI_USE_DDK
|
||||||
static int lookup_functions()
|
static int lookup_functions(void)
|
||||||
{
|
{
|
||||||
lib_handle = LoadLibrary(TEXT("hid.dll"));
|
lib_handle = LoadLibrary(TEXT("hid.dll"));
|
||||||
if (lib_handle) {
|
if (lib_handle) {
|
||||||
|
|||||||
@@ -1008,7 +1008,7 @@ static void HIDAPI_DelDevice(SDL_HIDAPI_Device *device)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static SDL_bool HIDAPI_CreateCombinedJoyCons()
|
static SDL_bool HIDAPI_CreateCombinedJoyCons(void)
|
||||||
{
|
{
|
||||||
SDL_HIDAPI_Device *device, *combined;
|
SDL_HIDAPI_Device *device, *combined;
|
||||||
SDL_HIDAPI_Device *joycons[2] = { NULL, NULL };
|
SDL_HIDAPI_Device *joycons[2] = { NULL, NULL };
|
||||||
|
|||||||
@@ -133,13 +133,13 @@ static int PS2_JoystickInit(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Function to return the number of joystick devices plugged in right now */
|
/* Function to return the number of joystick devices plugged in right now */
|
||||||
static int PS2_JoystickGetCount()
|
static int PS2_JoystickGetCount(void)
|
||||||
{
|
{
|
||||||
return (int)enabled_pads;
|
return (int)enabled_pads;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Function to cause any queued joystick insertions to be processed */
|
/* Function to cause any queued joystick insertions to be processed */
|
||||||
static void PS2_JoystickDetect()
|
static void PS2_JoystickDetect(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -145,12 +145,12 @@ int VITA_JoystickInit(void)
|
|||||||
return SDL_numjoysticks;
|
return SDL_numjoysticks;
|
||||||
}
|
}
|
||||||
|
|
||||||
int VITA_JoystickGetCount()
|
int VITA_JoystickGetCount(void)
|
||||||
{
|
{
|
||||||
return SDL_numjoysticks;
|
return SDL_numjoysticks;
|
||||||
}
|
}
|
||||||
|
|
||||||
void VITA_JoystickDetect()
|
void VITA_JoystickDetect(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -331,7 +331,7 @@ static struct
|
|||||||
static SDL_bool xinput_device_change = SDL_TRUE;
|
static SDL_bool xinput_device_change = SDL_TRUE;
|
||||||
static SDL_bool xinput_state_dirty = SDL_TRUE;
|
static SDL_bool xinput_state_dirty = SDL_TRUE;
|
||||||
|
|
||||||
static void RAWINPUT_UpdateXInput()
|
static void RAWINPUT_UpdateXInput(void)
|
||||||
{
|
{
|
||||||
DWORD user_index;
|
DWORD user_index;
|
||||||
if (xinput_device_change) {
|
if (xinput_device_change) {
|
||||||
@@ -371,7 +371,7 @@ static void RAWINPUT_MarkXInputSlotFree(Uint8 xinput_slot)
|
|||||||
xinput_state[xinput_slot].used = SDL_FALSE;
|
xinput_state[xinput_slot].used = SDL_FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
static SDL_bool RAWINPUT_MissingXInputSlot()
|
static SDL_bool RAWINPUT_MissingXInputSlot(void)
|
||||||
{
|
{
|
||||||
int ii;
|
int ii;
|
||||||
for (ii = 0; ii < SDL_arraysize(xinput_state); ii++) {
|
for (ii = 0; ii < SDL_arraysize(xinput_state); ii++) {
|
||||||
@@ -556,7 +556,7 @@ static void RAWINPUT_MarkWindowsGamingInputSlotFree(WindowsGamingInputGamepadSta
|
|||||||
wgi_slot->correlated_context = NULL;
|
wgi_slot->correlated_context = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SDL_bool RAWINPUT_MissingWindowsGamingInputSlot()
|
static SDL_bool RAWINPUT_MissingWindowsGamingInputSlot(void)
|
||||||
{
|
{
|
||||||
int ii;
|
int ii;
|
||||||
for (ii = 0; ii < wgi_state.per_gamepad_count; ii++) {
|
for (ii = 0; ii < wgi_state.per_gamepad_count; ii++) {
|
||||||
@@ -567,7 +567,7 @@ static SDL_bool RAWINPUT_MissingWindowsGamingInputSlot()
|
|||||||
return SDL_FALSE;
|
return SDL_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void RAWINPUT_UpdateWindowsGamingInput()
|
static void RAWINPUT_UpdateWindowsGamingInput(void)
|
||||||
{
|
{
|
||||||
int ii;
|
int ii;
|
||||||
if (!wgi_state.gamepad_statics) {
|
if (!wgi_state.gamepad_statics) {
|
||||||
@@ -1050,7 +1050,7 @@ static int RAWINPUT_JoystickGetCount(void)
|
|||||||
return SDL_RAWINPUT_numjoysticks;
|
return SDL_RAWINPUT_numjoysticks;
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_bool RAWINPUT_IsEnabled()
|
SDL_bool RAWINPUT_IsEnabled(void)
|
||||||
{
|
{
|
||||||
return SDL_RAWINPUT_inited && !SDL_RAWINPUT_remote_desktop;
|
return SDL_RAWINPUT_inited && !SDL_RAWINPUT_remote_desktop;
|
||||||
}
|
}
|
||||||
@@ -2087,7 +2087,7 @@ int RAWINPUT_RegisterNotifications(HWND hWnd)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int RAWINPUT_UnregisterNotifications()
|
int RAWINPUT_UnregisterNotifications(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
RAWINPUTDEVICE rid[SDL_arraysize(subscribed_devices)];
|
RAWINPUTDEVICE rid[SDL_arraysize(subscribed_devices)];
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ static SDL_bool SDL_IsXInputDevice(Uint16 vendor, Uint16 product)
|
|||||||
return SDL_FALSE;
|
return SDL_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void WGI_LoadRawGameControllerStatics()
|
static void WGI_LoadRawGameControllerStatics(void)
|
||||||
{
|
{
|
||||||
WindowsCreateStringReference_t WindowsCreateStringReferenceFunc = NULL;
|
WindowsCreateStringReference_t WindowsCreateStringReferenceFunc = NULL;
|
||||||
RoGetActivationFactory_t RoGetActivationFactoryFunc = NULL;
|
RoGetActivationFactory_t RoGetActivationFactoryFunc = NULL;
|
||||||
@@ -247,7 +247,7 @@ static void WGI_LoadRawGameControllerStatics()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void WGI_LoadOtherControllerStatics()
|
static void WGI_LoadOtherControllerStatics(void)
|
||||||
{
|
{
|
||||||
WindowsCreateStringReference_t WindowsCreateStringReferenceFunc = NULL;
|
WindowsCreateStringReference_t WindowsCreateStringReferenceFunc = NULL;
|
||||||
RoGetActivationFactory_t RoGetActivationFactoryFunc = NULL;
|
RoGetActivationFactory_t RoGetActivationFactoryFunc = NULL;
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
static SDL_bool s_bXInputEnabled = SDL_TRUE;
|
static SDL_bool s_bXInputEnabled = SDL_TRUE;
|
||||||
|
|
||||||
static SDL_bool SDL_XInputUseOldJoystickMapping()
|
static SDL_bool SDL_XInputUseOldJoystickMapping(void)
|
||||||
{
|
{
|
||||||
#ifdef __WINRT__
|
#ifdef __WINRT__
|
||||||
/* TODO: remove this __WINRT__ block, but only after integrating with UWP/WinRT's HID API */
|
/* TODO: remove this __WINRT__ block, but only after integrating with UWP/WinRT's HID API */
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
#undef main
|
#undef main
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__attribute__((weak)) void reset_IOP()
|
__attribute__((weak)) void reset_IOP(void)
|
||||||
{
|
{
|
||||||
SifInitRpc(0);
|
SifInitRpc(0);
|
||||||
while (!SifIopReset(NULL, 0)) {
|
while (!SifIopReset(NULL, 0)) {
|
||||||
@@ -32,7 +32,7 @@ __attribute__((weak)) void reset_IOP()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void prepare_IOP()
|
static void prepare_IOP(void)
|
||||||
{
|
{
|
||||||
reset_IOP();
|
reset_IOP();
|
||||||
SifInitRpc(0);
|
SifInitRpc(0);
|
||||||
@@ -41,12 +41,12 @@ static void prepare_IOP()
|
|||||||
sbv_patch_fileio();
|
sbv_patch_fileio();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void init_drivers()
|
static void init_drivers(void)
|
||||||
{
|
{
|
||||||
init_ps2_filesystem_driver();
|
init_ps2_filesystem_driver();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void deinit_drivers()
|
static void deinit_drivers(void)
|
||||||
{
|
{
|
||||||
deinit_ps2_filesystem_driver();
|
deinit_ps2_filesystem_driver();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ typedef struct
|
|||||||
static int vsync_sema_id = 0;
|
static int vsync_sema_id = 0;
|
||||||
|
|
||||||
/* PRIVATE METHODS */
|
/* PRIVATE METHODS */
|
||||||
static int vsync_handler()
|
static int vsync_handler(void)
|
||||||
{
|
{
|
||||||
iSignalSema(vsync_sema_id);
|
iSignalSema(vsync_sema_id);
|
||||||
|
|
||||||
|
|||||||
@@ -4472,7 +4472,7 @@ struct mallinfo dlmallinfo(void) {
|
|||||||
}
|
}
|
||||||
#endif /* NO_MALLINFO */
|
#endif /* NO_MALLINFO */
|
||||||
|
|
||||||
void dlmalloc_stats() {
|
void dlmalloc_stats(void) {
|
||||||
internal_malloc_stats(gm);
|
internal_malloc_stats(gm);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -120,12 +120,12 @@ localexit:
|
|||||||
/* *INDENT-ON* */
|
/* *INDENT-ON* */
|
||||||
}
|
}
|
||||||
|
|
||||||
void _ftol2_sse()
|
void _ftol2_sse(void)
|
||||||
{
|
{
|
||||||
_ftol();
|
_ftol();
|
||||||
}
|
}
|
||||||
|
|
||||||
void _ftol2()
|
void _ftol2(void)
|
||||||
{
|
{
|
||||||
_ftol();
|
_ftol();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ void SDLTest_AssertPass(SDL_PRINTF_FORMAT_STRING const char *assertDescription,
|
|||||||
/*
|
/*
|
||||||
* Resets the assert summary counters to zero.
|
* Resets the assert summary counters to zero.
|
||||||
*/
|
*/
|
||||||
void SDLTest_ResetAssertSummary()
|
void SDLTest_ResetAssertSummary(void)
|
||||||
{
|
{
|
||||||
SDLTest_AssertsPassed = 0;
|
SDLTest_AssertsPassed = 0;
|
||||||
SDLTest_AssertsFailed = 0;
|
SDLTest_AssertsFailed = 0;
|
||||||
@@ -117,7 +117,7 @@ void SDLTest_ResetAssertSummary()
|
|||||||
* Logs summary of all assertions (total, pass, fail) since last reset
|
* Logs summary of all assertions (total, pass, fail) since last reset
|
||||||
* as INFO (failed==0) or ERROR (failed > 0).
|
* as INFO (failed==0) or ERROR (failed > 0).
|
||||||
*/
|
*/
|
||||||
void SDLTest_LogAssertSummary()
|
void SDLTest_LogAssertSummary(void)
|
||||||
{
|
{
|
||||||
int totalAsserts = SDLTest_AssertsPassed + SDLTest_AssertsFailed;
|
int totalAsserts = SDLTest_AssertsPassed + SDLTest_AssertsFailed;
|
||||||
if (SDLTest_AssertsFailed == 0) {
|
if (SDLTest_AssertsFailed == 0) {
|
||||||
@@ -130,7 +130,7 @@ void SDLTest_LogAssertSummary()
|
|||||||
/*
|
/*
|
||||||
* Converts the current assert state into a test result
|
* Converts the current assert state into a test result
|
||||||
*/
|
*/
|
||||||
int SDLTest_AssertSummaryToTestResult()
|
int SDLTest_AssertSummaryToTestResult(void)
|
||||||
{
|
{
|
||||||
if (SDLTest_AssertsFailed > 0) {
|
if (SDLTest_AssertsFailed > 0) {
|
||||||
return TEST_RESULT_FAILED;
|
return TEST_RESULT_FAILED;
|
||||||
|
|||||||
+14
-14
@@ -68,54 +68,54 @@ void SDLTest_FuzzerInit(Uint64 execKey)
|
|||||||
fuzzerInvocationCounter = 0;
|
fuzzerInvocationCounter = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int SDLTest_GetFuzzerInvocationCount()
|
int SDLTest_GetFuzzerInvocationCount(void)
|
||||||
{
|
{
|
||||||
return fuzzerInvocationCounter;
|
return fuzzerInvocationCounter;
|
||||||
}
|
}
|
||||||
|
|
||||||
Uint8 SDLTest_RandomUint8()
|
Uint8 SDLTest_RandomUint8(void)
|
||||||
{
|
{
|
||||||
fuzzerInvocationCounter++;
|
fuzzerInvocationCounter++;
|
||||||
|
|
||||||
return (Uint8)SDLTest_RandomInt(&rndContext) & 0x000000FF;
|
return (Uint8)SDLTest_RandomInt(&rndContext) & 0x000000FF;
|
||||||
}
|
}
|
||||||
|
|
||||||
Sint8 SDLTest_RandomSint8()
|
Sint8 SDLTest_RandomSint8(void)
|
||||||
{
|
{
|
||||||
fuzzerInvocationCounter++;
|
fuzzerInvocationCounter++;
|
||||||
|
|
||||||
return (Sint8)SDLTest_RandomInt(&rndContext) & 0x000000FF;
|
return (Sint8)SDLTest_RandomInt(&rndContext) & 0x000000FF;
|
||||||
}
|
}
|
||||||
|
|
||||||
Uint16 SDLTest_RandomUint16()
|
Uint16 SDLTest_RandomUint16(void)
|
||||||
{
|
{
|
||||||
fuzzerInvocationCounter++;
|
fuzzerInvocationCounter++;
|
||||||
|
|
||||||
return (Uint16)SDLTest_RandomInt(&rndContext) & 0x0000FFFF;
|
return (Uint16)SDLTest_RandomInt(&rndContext) & 0x0000FFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
Sint16 SDLTest_RandomSint16()
|
Sint16 SDLTest_RandomSint16(void)
|
||||||
{
|
{
|
||||||
fuzzerInvocationCounter++;
|
fuzzerInvocationCounter++;
|
||||||
|
|
||||||
return (Sint16)SDLTest_RandomInt(&rndContext) & 0x0000FFFF;
|
return (Sint16)SDLTest_RandomInt(&rndContext) & 0x0000FFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
Sint32 SDLTest_RandomSint32()
|
Sint32 SDLTest_RandomSint32(void)
|
||||||
{
|
{
|
||||||
fuzzerInvocationCounter++;
|
fuzzerInvocationCounter++;
|
||||||
|
|
||||||
return (Sint32)SDLTest_RandomInt(&rndContext);
|
return (Sint32)SDLTest_RandomInt(&rndContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
Uint32 SDLTest_RandomUint32()
|
Uint32 SDLTest_RandomUint32(void)
|
||||||
{
|
{
|
||||||
fuzzerInvocationCounter++;
|
fuzzerInvocationCounter++;
|
||||||
|
|
||||||
return (Uint32)SDLTest_RandomInt(&rndContext);
|
return (Uint32)SDLTest_RandomInt(&rndContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
Uint64 SDLTest_RandomUint64()
|
Uint64 SDLTest_RandomUint64(void)
|
||||||
{
|
{
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
@@ -132,7 +132,7 @@ Uint64 SDLTest_RandomUint64()
|
|||||||
return value.v64;
|
return value.v64;
|
||||||
}
|
}
|
||||||
|
|
||||||
Sint64 SDLTest_RandomSint64()
|
Sint64 SDLTest_RandomSint64(void)
|
||||||
{
|
{
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
@@ -425,24 +425,24 @@ Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL
|
|||||||
validDomain);
|
validDomain);
|
||||||
}
|
}
|
||||||
|
|
||||||
float SDLTest_RandomUnitFloat()
|
float SDLTest_RandomUnitFloat(void)
|
||||||
{
|
{
|
||||||
return SDLTest_RandomUint32() / (float)UINT_MAX;
|
return SDLTest_RandomUint32() / (float)UINT_MAX;
|
||||||
}
|
}
|
||||||
|
|
||||||
float SDLTest_RandomFloat()
|
float SDLTest_RandomFloat(void)
|
||||||
{
|
{
|
||||||
return (float)(SDLTest_RandomUnitDouble() * 2.0 * (double)FLT_MAX - (double)(FLT_MAX));
|
return (float)(SDLTest_RandomUnitDouble() * 2.0 * (double)FLT_MAX - (double)(FLT_MAX));
|
||||||
}
|
}
|
||||||
|
|
||||||
double
|
double
|
||||||
SDLTest_RandomUnitDouble()
|
SDLTest_RandomUnitDouble(void)
|
||||||
{
|
{
|
||||||
return (double)(SDLTest_RandomUint64() >> 11) * (1.0 / 9007199254740992.0);
|
return (double)(SDLTest_RandomUint64() >> 11) * (1.0 / 9007199254740992.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
double
|
double
|
||||||
SDLTest_RandomDouble()
|
SDLTest_RandomDouble(void)
|
||||||
{
|
{
|
||||||
double r = 0.0;
|
double r = 0.0;
|
||||||
double s = 1.0;
|
double s = 1.0;
|
||||||
@@ -456,7 +456,7 @@ SDLTest_RandomDouble()
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *SDLTest_RandomAsciiString()
|
char *SDLTest_RandomAsciiString(void)
|
||||||
{
|
{
|
||||||
return SDLTest_RandomAsciiStringWithMaximumLength(255);
|
return SDLTest_RandomAsciiStringWithMaximumLength(255);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -339,7 +339,7 @@ static void SDLTest_LogTestSuiteSummary(SDLTest_TestSuiteReference *testSuites)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Gets a timer value in seconds */
|
/* Gets a timer value in seconds */
|
||||||
static float GetClock()
|
static float GetClock(void)
|
||||||
{
|
{
|
||||||
float currentClock = SDL_GetPerformanceCounter() / (float)SDL_GetPerformanceFrequency();
|
float currentClock = SDL_GetPerformanceCounter() / (float)SDL_GetPerformanceFrequency();
|
||||||
return currentClock;
|
return currentClock;
|
||||||
|
|||||||
@@ -540,7 +540,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlit = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the Blit test image as SDL_Surface.
|
* \brief Returns the Blit test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImageBlit()
|
SDL_Surface *SDLTest_ImageBlit(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imageBlit.pixel_data,
|
(void *)SDLTest_imageBlit.pixel_data,
|
||||||
@@ -1014,7 +1014,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitColor = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the BlitColor test image as SDL_Surface.
|
* \brief Returns the BlitColor test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImageBlitColor()
|
SDL_Surface *SDLTest_ImageBlitColor(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imageBlitColor.pixel_data,
|
(void *)SDLTest_imageBlitColor.pixel_data,
|
||||||
@@ -1651,7 +1651,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitAlpha = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the BlitAlpha test image as SDL_Surface.
|
* \brief Returns the BlitAlpha test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImageBlitAlpha()
|
SDL_Surface *SDLTest_ImageBlitAlpha(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imageBlitAlpha.pixel_data,
|
(void *)SDLTest_imageBlitAlpha.pixel_data,
|
||||||
|
|||||||
@@ -580,7 +580,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendAdd = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the BlitBlendAdd test image as SDL_Surface.
|
* \brief Returns the BlitBlendAdd test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImageBlitBlendAdd()
|
SDL_Surface *SDLTest_ImageBlitBlendAdd(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imageBlitBlendAdd.pixel_data,
|
(void *)SDLTest_imageBlitBlendAdd.pixel_data,
|
||||||
@@ -1171,7 +1171,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlend = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the BlitBlend test image as SDL_Surface.
|
* \brief Returns the BlitBlend test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImageBlitBlend()
|
SDL_Surface *SDLTest_ImageBlitBlend(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imageBlitBlend.pixel_data,
|
(void *)SDLTest_imageBlitBlend.pixel_data,
|
||||||
@@ -1592,7 +1592,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendMod = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the BlitBlendMod test image as SDL_Surface.
|
* \brief Returns the BlitBlendMod test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImageBlitBlendMod()
|
SDL_Surface *SDLTest_ImageBlitBlendMod(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imageBlitBlendMod.pixel_data,
|
(void *)SDLTest_imageBlitBlendMod.pixel_data,
|
||||||
@@ -2396,7 +2396,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendNone = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the BlitBlendNone test image as SDL_Surface.
|
* \brief Returns the BlitBlendNone test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImageBlitBlendNone()
|
SDL_Surface *SDLTest_ImageBlitBlendNone(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imageBlitBlendNone.pixel_data,
|
(void *)SDLTest_imageBlitBlendNone.pixel_data,
|
||||||
@@ -2932,7 +2932,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendAll = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the BlitBlendAll test image as SDL_Surface.
|
* \brief Returns the BlitBlendAll test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImageBlitBlendAll()
|
SDL_Surface *SDLTest_ImageBlitBlendAll(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imageBlitBlendAll.pixel_data,
|
(void *)SDLTest_imageBlitBlendAll.pixel_data,
|
||||||
|
|||||||
@@ -223,7 +223,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imageFace = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the Face test image as SDL_Surface.
|
* \brief Returns the Face test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImageFace()
|
SDL_Surface *SDLTest_ImageFace(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imageFace.pixel_data,
|
(void *)SDLTest_imageFace.pixel_data,
|
||||||
|
|||||||
@@ -504,7 +504,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imagePrimitives = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the Primitives test image as SDL_Surface.
|
* \brief Returns the Primitives test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImagePrimitives()
|
SDL_Surface *SDLTest_ImagePrimitives(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imagePrimitives.pixel_data,
|
(void *)SDLTest_imagePrimitives.pixel_data,
|
||||||
|
|||||||
@@ -677,7 +677,7 @@ static const SDLTest_SurfaceImage_t SDLTest_imagePrimitivesBlend = {
|
|||||||
/**
|
/**
|
||||||
* \brief Returns the PrimitivesBlend test image as SDL_Surface.
|
* \brief Returns the PrimitivesBlend test image as SDL_Surface.
|
||||||
*/
|
*/
|
||||||
SDL_Surface *SDLTest_ImagePrimitivesBlend()
|
SDL_Surface *SDLTest_ImagePrimitivesBlend(void)
|
||||||
{
|
{
|
||||||
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormatFrom(
|
||||||
(void *)SDLTest_imagePrimitivesBlend.pixel_data,
|
(void *)SDLTest_imagePrimitivesBlend.pixel_data,
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ static void SDLCALL SDLTest_TrackedFree(void *ptr)
|
|||||||
SDL_free_orig(ptr);
|
SDL_free_orig(ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
int SDLTest_TrackAllocations()
|
int SDLTest_TrackAllocations(void)
|
||||||
{
|
{
|
||||||
if (SDL_malloc_orig) {
|
if (SDL_malloc_orig) {
|
||||||
return 0;
|
return 0;
|
||||||
@@ -220,7 +220,7 @@ int SDLTest_TrackAllocations()
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDLTest_LogAllocations()
|
void SDLTest_LogAllocations(void)
|
||||||
{
|
{
|
||||||
char *message = NULL;
|
char *message = NULL;
|
||||||
size_t message_size = 0;
|
size_t message_size = 0;
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ static int SDLCALL SDL_SoftBlit(SDL_Surface *src, SDL_Rect *srcrect,
|
|||||||
#ifdef __MACOSX__
|
#ifdef __MACOSX__
|
||||||
#include <sys/sysctl.h>
|
#include <sys/sysctl.h>
|
||||||
|
|
||||||
static SDL_bool SDL_UseAltivecPrefetch()
|
static SDL_bool SDL_UseAltivecPrefetch(void)
|
||||||
{
|
{
|
||||||
const char key[] = "hw.l3cachesize";
|
const char key[] = "hw.l3cachesize";
|
||||||
u_int64_t result = 0;
|
u_int64_t result = 0;
|
||||||
|
|||||||
@@ -367,7 +367,7 @@ static void printf_128(const char *str, __m128i var)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static SDL_INLINE int hasSSE2()
|
static SDL_INLINE int hasSSE2(void)
|
||||||
{
|
{
|
||||||
static int val = -1;
|
static int val = -1;
|
||||||
if (val != -1) {
|
if (val != -1) {
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ static SDL_Cursor *Android_WrapCursor(int custom_cursor, int system_cursor)
|
|||||||
return cursor;
|
return cursor;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SDL_Cursor *Android_CreateDefaultCursor()
|
static SDL_Cursor *Android_CreateDefaultCursor(void)
|
||||||
{
|
{
|
||||||
return Android_WrapCursor(0, SDL_SYSTEM_CURSOR_ARROW);
|
return Android_WrapCursor(0, SDL_SYSTEM_CURSOR_ARROW);
|
||||||
}
|
}
|
||||||
@@ -116,7 +116,7 @@ static void Android_FreeCursor(SDL_Cursor *cursor)
|
|||||||
SDL_free(cursor);
|
SDL_free(cursor);
|
||||||
}
|
}
|
||||||
|
|
||||||
static SDL_Cursor *Android_CreateEmptyCursor()
|
static SDL_Cursor *Android_CreateEmptyCursor(void)
|
||||||
{
|
{
|
||||||
if (!empty_cursor) {
|
if (!empty_cursor) {
|
||||||
SDL_Surface *empty_surface = SDL_CreateRGBSurfaceWithFormat(0, 1, 1, 32, SDL_PIXELFORMAT_ARGB8888);
|
SDL_Surface *empty_surface = SDL_CreateRGBSurfaceWithFormat(0, 1, 1, 32, SDL_PIXELFORMAT_ARGB8888);
|
||||||
@@ -129,7 +129,7 @@ static SDL_Cursor *Android_CreateEmptyCursor()
|
|||||||
return empty_cursor;
|
return empty_cursor;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Android_DestroyEmptyCursor()
|
static void Android_DestroyEmptyCursor(void)
|
||||||
{
|
{
|
||||||
if (empty_cursor) {
|
if (empty_cursor) {
|
||||||
Android_FreeCursor(empty_cursor);
|
Android_FreeCursor(empty_cursor);
|
||||||
|
|||||||
@@ -561,7 +561,7 @@ static void DirectFB_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * textur
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void DirectFB_SetTextureScaleMode()
|
static void DirectFB_SetTextureScaleMode(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ VideoBootStrap DUMMY_evdev_bootstrap = {
|
|||||||
NULL /* no ShowMessageBox implementation */
|
NULL /* no ShowMessageBox implementation */
|
||||||
};
|
};
|
||||||
void SDL_EVDEV_Init(void);
|
void SDL_EVDEV_Init(void);
|
||||||
void SDL_EVDEV_Poll();
|
void SDL_EVDEV_Poll(void);
|
||||||
void SDL_EVDEV_Quit(void);
|
void SDL_EVDEV_Quit(void);
|
||||||
static void DUMMY_EVDEV_Poll(_THIS)
|
static void DUMMY_EVDEV_Poll(_THIS)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ static int Emscripten_SetRelativeMouseMode(SDL_bool enabled)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Emscripten_InitMouse()
|
void Emscripten_InitMouse(void)
|
||||||
{
|
{
|
||||||
SDL_Mouse *mouse = SDL_GetMouse();
|
SDL_Mouse *mouse = SDL_GetMouse();
|
||||||
|
|
||||||
@@ -236,7 +236,7 @@ void Emscripten_InitMouse()
|
|||||||
SDL_SetDefaultCursor(Emscripten_CreateDefaultCursor());
|
SDL_SetDefaultCursor(Emscripten_CreateDefaultCursor());
|
||||||
}
|
}
|
||||||
|
|
||||||
void Emscripten_FiniMouse()
|
void Emscripten_FiniMouse(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,17 +30,17 @@
|
|||||||
static SwkbdState sw_keyboard;
|
static SwkbdState sw_keyboard;
|
||||||
const static size_t BUFFER_SIZE = 256;
|
const static size_t BUFFER_SIZE = 256;
|
||||||
|
|
||||||
void N3DS_SwkbInit()
|
void N3DS_SwkbInit(void)
|
||||||
{
|
{
|
||||||
swkbdInit(&sw_keyboard, SWKBD_TYPE_NORMAL, 2, -1);
|
swkbdInit(&sw_keyboard, SWKBD_TYPE_NORMAL, 2, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void N3DS_SwkbPoll()
|
void N3DS_SwkbPoll(void)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
void N3DS_SwkbQuit()
|
void N3DS_SwkbQuit(void)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ static void RPI_Destroy(SDL_VideoDevice *device)
|
|||||||
SDL_free(device);
|
SDL_free(device);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int RPI_GetRefreshRate()
|
static int RPI_GetRefreshRate(void)
|
||||||
{
|
{
|
||||||
TV_DISPLAY_STATE_T tvstate;
|
TV_DISPLAY_STATE_T tvstate;
|
||||||
if (vc_tv_get_display_state(&tvstate) == 0) {
|
if (vc_tv_get_display_state(&tvstate) == 0) {
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ static void Wayland_VideoQuit(_THIS);
|
|||||||
|
|
||||||
/* Find out what class name we should use
|
/* Find out what class name we should use
|
||||||
* Based on src/video/x11/SDL_x11video.c */
|
* Based on src/video/x11/SDL_x11video.c */
|
||||||
static char *get_classname()
|
static char *get_classname(void)
|
||||||
{
|
{
|
||||||
/* !!! FIXME: this is probably wrong, albeit harmless in many common cases. From protocol spec:
|
/* !!! FIXME: this is probably wrong, albeit harmless in many common cases. From protocol spec:
|
||||||
"The surface class identifies the general class of applications
|
"The surface class identifies the general class of applications
|
||||||
|
|||||||
@@ -330,7 +330,7 @@ static SDL_Scancode WindowsScanCodeToSDLScanCode(LPARAM lParam, WPARAM wParam)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
|
#if !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
|
||||||
static SDL_bool WIN_ShouldIgnoreFocusClick()
|
static SDL_bool WIN_ShouldIgnoreFocusClick(void)
|
||||||
{
|
{
|
||||||
return !SDL_GetHintBoolean(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, SDL_FALSE);
|
return !SDL_GetHintBoolean(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, SDL_FALSE);
|
||||||
}
|
}
|
||||||
@@ -1797,7 +1797,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
|
#if !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
|
||||||
static void WIN_UpdateClipCursorForWindows()
|
static void WIN_UpdateClipCursorForWindows(void)
|
||||||
{
|
{
|
||||||
SDL_VideoDevice *_this = SDL_GetVideoDevice();
|
SDL_VideoDevice *_this = SDL_GetVideoDevice();
|
||||||
SDL_Window *window;
|
SDL_Window *window;
|
||||||
@@ -1819,7 +1819,7 @@ static void WIN_UpdateClipCursorForWindows()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void WIN_UpdateMouseCapture()
|
static void WIN_UpdateMouseCapture(void)
|
||||||
{
|
{
|
||||||
SDL_Window *focusWindow = SDL_GetKeyboardFocus();
|
SDL_Window *focusWindow = SDL_GetKeyboardFocus();
|
||||||
|
|
||||||
@@ -2093,7 +2093,7 @@ int SDL_RegisterApp(const char *name, Uint32 style, void *hInst)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Unregisters the windowclass registered in SDL_RegisterApp above. */
|
/* Unregisters the windowclass registered in SDL_RegisterApp above. */
|
||||||
void SDL_UnregisterApp()
|
void SDL_UnregisterApp(void)
|
||||||
{
|
{
|
||||||
WNDCLASSEX wcex;
|
WNDCLASSEX wcex;
|
||||||
|
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ void WIN_QuitKeyboard(_THIS)
|
|||||||
#endif /* !SDL_DISABLE_WINDOWS_IME */
|
#endif /* !SDL_DISABLE_WINDOWS_IME */
|
||||||
}
|
}
|
||||||
|
|
||||||
void WIN_ResetDeadKeys()
|
void WIN_ResetDeadKeys(void)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
if a deadkey has been typed, but not the next character (which the deadkey might modify),
|
if a deadkey has been typed, but not the next character (which the deadkey might modify),
|
||||||
@@ -367,7 +367,7 @@ static void UILess_ReleaseSinks(SDL_VideoData *videodata);
|
|||||||
static void UILess_EnableUIUpdates(SDL_VideoData *videodata);
|
static void UILess_EnableUIUpdates(SDL_VideoData *videodata);
|
||||||
static void UILess_DisableUIUpdates(SDL_VideoData *videodata);
|
static void UILess_DisableUIUpdates(SDL_VideoData *videodata);
|
||||||
|
|
||||||
static SDL_bool WIN_ShouldShowNativeUI()
|
static SDL_bool WIN_ShouldShowNativeUI(void)
|
||||||
{
|
{
|
||||||
return SDL_GetHintBoolean(SDL_HINT_IME_SHOW_UI, SDL_FALSE);
|
return SDL_GetHintBoolean(SDL_HINT_IME_SHOW_UI, SDL_FALSE);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -474,7 +474,7 @@ static void WIN_SetLinearMouseScale(int mouse_speed)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void WIN_UpdateMouseSystemScale()
|
void WIN_UpdateMouseSystemScale(void)
|
||||||
{
|
{
|
||||||
int mouse_speed;
|
int mouse_speed;
|
||||||
int params[3] = { 0, 0, 0 };
|
int params[3] = { 0, 0, 0 };
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ static int X11_VideoInit(_THIS);
|
|||||||
static void X11_VideoQuit(_THIS);
|
static void X11_VideoQuit(_THIS);
|
||||||
|
|
||||||
/* Find out what class name we should use */
|
/* Find out what class name we should use */
|
||||||
static char *get_classname()
|
static char *get_classname(void)
|
||||||
{
|
{
|
||||||
char *spot;
|
char *spot;
|
||||||
#if defined(__LINUX__) || defined(__FREEBSD__)
|
#if defined(__LINUX__) || defined(__FREEBSD__)
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user