From 1b124d9a6211df3fa747d9d0f570f21d2eb1ae27 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 21 Jan 2013 02:50:11 -0500 Subject: [PATCH] Cleaned out a few C++ single-line comments. Should we bother doing this anymore? Is there really a C compiler we care about that doesn't support this? --- src/video/x11/SDL_x11events.c | 2 +- src/video/x11/SDL_x11messagebox.c | 10 +++++----- src/video/x11/SDL_x11mouse.c | 4 ++-- src/video/x11/SDL_x11opengl.c | 4 ++-- src/video/x11/SDL_x11opengles.c | 11 ++++++++--- src/video/x11/SDL_x11video.c | 4 ++-- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c index 7daea9aca..324e5db0a 100644 --- a/src/video/x11/SDL_x11events.c +++ b/src/video/x11/SDL_x11events.c @@ -42,7 +42,7 @@ #include #ifdef SDL_INPUT_LINUXEV -//Touch Input/event* includes +/* Touch Input/event* includes */ #include #include #endif diff --git a/src/video/x11/SDL_x11messagebox.c b/src/video/x11/SDL_x11messagebox.c index dbfe08d0b..e6165026f 100644 --- a/src/video/x11/SDL_x11messagebox.c +++ b/src/video/x11/SDL_x11messagebox.c @@ -50,11 +50,11 @@ static const char g_MessageBoxFontLatin1[] = "-*-*-medium-r-normal--0-120-*-*-p- static const char g_MessageBoxFont[] = "-*-*-*-*-*-*-*-*-*-*-*-*-*-*"; static const SDL_MessageBoxColor g_default_colors[ SDL_MESSAGEBOX_COLOR_MAX ] = { - { 56, 54, 53 }, // SDL_MESSAGEBOX_COLOR_BACKGROUND, - { 209, 207, 205 }, // SDL_MESSAGEBOX_COLOR_TEXT, - { 140, 135, 129 }, // SDL_MESSAGEBOX_COLOR_BUTTON_BORDER, - { 105, 102, 99 }, // SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND, - { 205, 202, 53 }, // SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED, + { 56, 54, 53 }, /* SDL_MESSAGEBOX_COLOR_BACKGROUND, */ + { 209, 207, 205 }, /* SDL_MESSAGEBOX_COLOR_TEXT, */ + { 140, 135, 129 }, /* SDL_MESSAGEBOX_COLOR_BUTTON_BORDER, */ + { 105, 102, 99 }, /* SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND, */ + { 205, 202, 53 }, /* SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED, */ }; #define SDL_MAKE_RGB( _r, _g, _b ) ( ( ( Uint32 )( _r ) << 16 ) | \ diff --git a/src/video/x11/SDL_x11mouse.c b/src/video/x11/SDL_x11mouse.c index 40ac0c211..d957866ff 100644 --- a/src/video/x11/SDL_x11mouse.c +++ b/src/video/x11/SDL_x11mouse.c @@ -230,8 +230,8 @@ X11_CreateSystemCursor(SDL_SystemCursor id) default: SDL_assert(0); return NULL; - // X Font Cursors reference: - // http://tronche.com/gui/x/xlib/appendix/b/ + /* X Font Cursors reference: + http://tronche.com/gui/x/xlib/appendix/b/ */ case SDL_SYSTEM_CURSOR_ARROW: shape = XC_arrow; break; case SDL_SYSTEM_CURSOR_IBEAM: shape = XC_xterm; break; case SDL_SYSTEM_CURSOR_WAIT: shape = XC_watch; break; diff --git a/src/video/x11/SDL_x11opengl.c b/src/video/x11/SDL_x11opengl.c index 148493d3a..9e80d0cbf 100644 --- a/src/video/x11/SDL_x11opengl.c +++ b/src/video/x11/SDL_x11opengl.c @@ -460,8 +460,8 @@ X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int si GLX_SLOW_VISUAL_EXT; } - // If we're supposed to use DirectColor visuals, and we've got the EXT_visual_info - // extension, then add GLX_X_VISUAL_TYPE_EXT. + /* If we're supposed to use DirectColor visuals, and we've got the + EXT_visual_info extension, then add GLX_X_VISUAL_TYPE_EXT. */ if (X11_UseDirectColorVisuals() && _this->gl_data->HAS_GLX_EXT_visual_info) { attribs[i++] = GLX_X_VISUAL_TYPE_EXT; diff --git a/src/video/x11/SDL_x11opengles.c b/src/video/x11/SDL_x11opengles.c index d2a9a2f01..ca54f846a 100644 --- a/src/video/x11/SDL_x11opengles.c +++ b/src/video/x11/SDL_x11opengles.c @@ -355,8 +355,10 @@ X11_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) { int retval; -// SDL_WindowData *data = (SDL_WindowData *) window->driverdata; -// Display *display = data->videodata->display; +/* + SDL_WindowData *data = (SDL_WindowData *) window->driverdata; + Display *display = data->videodata->display; +*/ if (!_this->gles_data) { SDL_SetError("OpenGL not initialized"); @@ -371,7 +373,10 @@ X11_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) SDL_SetError("Unable to make EGL context current"); retval = -1; } -// XSync(display, False); + +/* + XSync(display, False); +*/ return (retval); } diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c index a7d48c54e..b533507c4 100644 --- a/src/video/x11/SDL_x11video.c +++ b/src/video/x11/SDL_x11video.c @@ -293,8 +293,8 @@ X11_CreateDevice(int devindex) return NULL; } - // Need for threading gl calls. This is also required for the proprietary nVidia - // driver to be threaded. + /* Need for threading gl calls. This is also required for the proprietary + nVidia driver to be threaded. */ XInitThreads(); /* Initialize all variables that we clean on shutdown */