Changed C++ style comments to fix pedantic warnings.
authorPhilipp Wiesemann <philipp.wiesemann@arcor.de>
Sat, 17 May 2014 22:02:25 +0200
changeset 877629aac8b813d9
parent 8775 047537a5a114
child 8777 04d0414f6812
Changed C++ style comments to fix pedantic warnings.
src/core/android/SDL_android.c
src/events/SDL_mouse.c
test/testdropfile.c
test/testgles2.c
test/testhotplug.c
     1.1 --- a/src/core/android/SDL_android.c	Sat May 17 21:52:05 2014 +0200
     1.2 +++ b/src/core/android/SDL_android.c	Sat May 17 22:02:25 2014 +0200
     1.3 @@ -148,7 +148,7 @@
     1.4      Android_SetScreenResolution(width, height, format);
     1.5  }
     1.6  
     1.7 -// Paddown
     1.8 +/* Paddown */
     1.9  JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadDown(
    1.10                                      JNIEnv* env, jclass jcls,
    1.11                                      jint device_id, jint keycode)
    1.12 @@ -156,7 +156,7 @@
    1.13      return Android_OnPadDown(device_id, keycode);
    1.14  }
    1.15  
    1.16 -// Padup
    1.17 +/* Padup */
    1.18  JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadUp(
    1.19                                     JNIEnv* env, jclass jcls,
    1.20                                     jint device_id, jint keycode)
     2.1 --- a/src/events/SDL_mouse.c	Sat May 17 21:52:05 2014 +0200
     2.2 +++ b/src/events/SDL_mouse.c	Sat May 17 22:02:25 2014 +0200
     2.3 @@ -539,7 +539,7 @@
     2.4          mouse->relative_mode_warp = SDL_TRUE;
     2.5      } else if (mouse->SetRelativeMouseMode(enabled) < 0) {
     2.6          if (enabled) {
     2.7 -            // Fall back to warp mode if native relative mode failed
     2.8 +            /* Fall back to warp mode if native relative mode failed */
     2.9              mouse->relative_mode_warp = SDL_TRUE;
    2.10          }
    2.11      }
     3.1 --- a/test/testdropfile.c	Sat May 17 21:52:05 2014 +0200
     3.2 +++ b/test/testdropfile.c	Sat May 17 22:02:25 2014 +0200
     3.3 @@ -44,7 +44,7 @@
     3.4          int consumed;
     3.5  
     3.6          consumed = SDLTest_CommonArg(state, i);
     3.7 -        // needed vodoo to allow app to launch via OS X Finder
     3.8 +        /* needed voodoo to allow app to launch via OS X Finder */
     3.9          if (SDL_strncmp(argv[i], "-psn", 4)==0) {
    3.10              consumed = 1;
    3.11          }
     4.1 --- a/test/testgles2.c	Sat May 17 21:52:05 2014 +0200
     4.2 +++ b/test/testgles2.c	Sat May 17 22:02:25 2014 +0200
     4.3 @@ -210,7 +210,7 @@
     4.4      GL_CHECK(ctx.glCompileShader(*shader));
     4.5      GL_CHECK(ctx.glGetShaderiv(*shader, GL_COMPILE_STATUS, &status));
     4.6  
     4.7 -    // Dump debug info (source and log) if compilation failed.
     4.8 +    /* Dump debug info (source and log) if compilation failed. */
     4.9      if(status != GL_TRUE) {
    4.10          SDL_Log("Shader compilation failed");
    4.11          quit(-1);
     5.1 --- a/test/testhotplug.c	Sat May 17 21:52:05 2014 +0200
     5.2 +++ b/test/testhotplug.c	Sat May 17 22:02:25 2014 +0200
     5.3 @@ -53,7 +53,9 @@
     5.4          exit(1);
     5.5      }
     5.6  
     5.7 +    /*
     5.8      //SDL_CreateWindow("Dummy", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 128, 128, 0);
     5.9 +    */
    5.10  
    5.11      SDL_Log("There are %d joysticks at startup\n", SDL_NumJoysticks());
    5.12      if (enable_haptic)