Skip to content
Permalink
Browse files

Changed C++ style comments to fix pedantic warnings.

  • Loading branch information
philippwiesemann committed May 17, 2014
1 parent 0d196c3 commit ca11d7c8b59d00a6c28747aa2e313af6936c8dda
Showing with 7 additions and 5 deletions.
  1. +2 −2 src/core/android/SDL_android.c
  2. +1 −1 src/events/SDL_mouse.c
  3. +1 −1 test/testdropfile.c
  4. +1 −1 test/testgles2.c
  5. +2 −0 test/testhotplug.c
@@ -148,15 +148,15 @@ JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeResize(
Android_SetScreenResolution(width, height, format);
}

// Paddown
/* Paddown */
JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadDown(
JNIEnv* env, jclass jcls,
jint device_id, jint keycode)
{
return Android_OnPadDown(device_id, keycode);
}

// Padup
/* Padup */
JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadUp(
JNIEnv* env, jclass jcls,
jint device_id, jint keycode)
@@ -539,7 +539,7 @@ SDL_SetRelativeMouseMode(SDL_bool enabled)
mouse->relative_mode_warp = SDL_TRUE;
} else if (mouse->SetRelativeMouseMode(enabled) < 0) {
if (enabled) {
// Fall back to warp mode if native relative mode failed
/* Fall back to warp mode if native relative mode failed */
mouse->relative_mode_warp = SDL_TRUE;
}
}
@@ -44,7 +44,7 @@ main(int argc, char *argv[])
int consumed;

consumed = SDLTest_CommonArg(state, i);
// needed vodoo to allow app to launch via OS X Finder
/* needed voodoo to allow app to launch via OS X Finder */
if (SDL_strncmp(argv[i], "-psn", 4)==0) {
consumed = 1;
}
@@ -210,7 +210,7 @@ process_shader(GLuint *shader, const char * source, GLint shader_type)
GL_CHECK(ctx.glCompileShader(*shader));
GL_CHECK(ctx.glGetShaderiv(*shader, GL_COMPILE_STATUS, &status));

// Dump debug info (source and log) if compilation failed.
/* Dump debug info (source and log) if compilation failed. */
if(status != GL_TRUE) {
SDL_Log("Shader compilation failed");
quit(-1);
@@ -53,7 +53,9 @@ main(int argc, char *argv[])
exit(1);
}

/*
//SDL_CreateWindow("Dummy", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 128, 128, 0);
*/

SDL_Log("There are %d joysticks at startup\n", SDL_NumJoysticks());
if (enable_haptic)

0 comments on commit ca11d7c

Please sign in to comment.