Skip to content

Commit

Permalink
Android: Fixed empty parameter list in signatures of internal functions.
Browse files Browse the repository at this point in the history
  • Loading branch information
philippwiesemann committed May 9, 2015
1 parent 6e4e9ce commit 5919a85
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
18 changes: 9 additions & 9 deletions src/core/android/SDL_android.c
Expand Up @@ -450,7 +450,7 @@ static void LocalReferenceHolder_Cleanup(struct LocalReferenceHolder *refholder)
}
}

static SDL_bool LocalReferenceHolder_IsActive()
static SDL_bool LocalReferenceHolder_IsActive(void)
{
return s_active > 0;
}
Expand All @@ -468,7 +468,7 @@ ANativeWindow* Android_JNI_GetNativeWindow(void)
return anw;
}

void Android_JNI_SwapWindow()
void Android_JNI_SwapWindow(void)
{
JNIEnv *mEnv = Android_JNI_GetEnv();
(*mEnv)->CallStaticVoidMethod(mEnv, mActivityClass, midFlipBuffers);
Expand Down Expand Up @@ -620,12 +620,12 @@ int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, i
return audioBufferFrames;
}

void * Android_JNI_GetAudioBuffer()
void * Android_JNI_GetAudioBuffer(void)
{
return audioBufferPinned;
}

void Android_JNI_WriteAudioBuffer()
void Android_JNI_WriteAudioBuffer(void)
{
JNIEnv *mAudioEnv = Android_JNI_GetEnv();

Expand All @@ -640,7 +640,7 @@ void Android_JNI_WriteAudioBuffer()
/* JNI_COMMIT means the changes are committed to the VM but the buffer remains pinned */
}

void Android_JNI_CloseAudioDevice()
void Android_JNI_CloseAudioDevice(void)
{
JNIEnv *env = Android_JNI_GetEnv();

Expand Down Expand Up @@ -1142,7 +1142,7 @@ int Android_JNI_SetClipboardText(const char* text)
return 0;
}

char* Android_JNI_GetClipboardText()
char* Android_JNI_GetClipboardText(void)
{
SETUP_CLIPBOARD(SDL_strdup(""))

Expand All @@ -1168,7 +1168,7 @@ char* Android_JNI_GetClipboardText()
return SDL_strdup("");
}

SDL_bool Android_JNI_HasClipboardText()
SDL_bool Android_JNI_HasClipboardText(void)
{
SETUP_CLIPBOARD(SDL_FALSE)

Expand Down Expand Up @@ -1304,7 +1304,7 @@ int Android_JNI_GetTouchDeviceIds(int **ids) {
return number;
}

void Android_JNI_PollInputDevices()
void Android_JNI_PollInputDevices(void)
{
JNIEnv *env = Android_JNI_GetEnv();
(*env)->CallStaticVoidMethod(env, mActivityClass, midPollInputDevices);
Expand Down Expand Up @@ -1351,7 +1351,7 @@ void Android_JNI_ShowTextInput(SDL_Rect *inputRect)
inputRect->h );
}

void Android_JNI_HideTextInput()
void Android_JNI_HideTextInput(void)
{
/* has to match Activity constant */
const int COMMAND_TEXTEDIT_HIDE = 3;
Expand Down
16 changes: 8 additions & 8 deletions src/core/android/SDL_android.h
Expand Up @@ -35,18 +35,18 @@ extern "C" {
/* Interface from the SDL library into the Android Java activity */
/* extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion, int red, int green, int blue, int alpha, int buffer, int depth, int stencil, int buffers, int samples);
extern SDL_bool Android_JNI_DeleteContext(void); */
extern void Android_JNI_SwapWindow();
extern void Android_JNI_SwapWindow(void);
extern void Android_JNI_SetActivityTitle(const char *title);
extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
extern void Android_JNI_ShowTextInput(SDL_Rect *inputRect);
extern void Android_JNI_HideTextInput();
extern void Android_JNI_HideTextInput(void);
extern ANativeWindow* Android_JNI_GetNativeWindow(void);

/* Audio support */
extern int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames);
extern void* Android_JNI_GetAudioBuffer();
extern void Android_JNI_WriteAudioBuffer();
extern void Android_JNI_CloseAudioDevice();
extern void* Android_JNI_GetAudioBuffer(void);
extern void Android_JNI_WriteAudioBuffer(void);
extern void Android_JNI_CloseAudioDevice(void);

#include "SDL_rwops.h"

Expand All @@ -59,14 +59,14 @@ int Android_JNI_FileClose(SDL_RWops* ctx);

/* Clipboard support */
int Android_JNI_SetClipboardText(const char* text);
char* Android_JNI_GetClipboardText();
SDL_bool Android_JNI_HasClipboardText();
char* Android_JNI_GetClipboardText(void);
SDL_bool Android_JNI_HasClipboardText(void);

/* Power support */
int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seconds, int* percent);

/* Joystick support */
void Android_JNI_PollInputDevices();
void Android_JNI_PollInputDevices(void);

/* Video */
void Android_JNI_SuspendScreenSaver(SDL_bool suspend);
Expand Down

0 comments on commit 5919a85

Please sign in to comment.