pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned out a few C++ single-line comments.

Browse source 
Should we bother doing this anymore? Is there really a C compiler we care
 about that doesn't support this?
This commit is contained in:
Ryan C. Gordon 2013-01-21 02:50:11 -05:00
parent 09cbdb12c9
commit d41de59fc9
6 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/video/x11/SDL_x11events.c
View file

@ -42,7 +42,7 @@
#include <stdio.h> #include <stdio.h>
#ifdef SDL_INPUT_LINUXEV #ifdef SDL_INPUT_LINUXEV
//Touch Input/event* includes /* Touch Input/event* includes */
#include <linux/input.h> #include <linux/input.h>
#include <fcntl.h> #include <fcntl.h>
#endif #endif

10
src/video/x11/SDL_x11messagebox.c
View file

@ -50,11 +50,11 @@ static const char g_MessageBoxFontLatin1[] = "-*-*-medium-r-normal--0-120-*-*-p-
static const char g_MessageBoxFont[] = "-*-*-*-*-*-*-*-*-*-*-*-*-*-*"; static const char g_MessageBoxFont[] = "-*-*-*-*-*-*-*-*-*-*-*-*-*-*";
static const SDL_MessageBoxColor g_default_colors[ SDL_MESSAGEBOX_COLOR_MAX ] = { static const SDL_MessageBoxColor g_default_colors[ SDL_MESSAGEBOX_COLOR_MAX ] = {
{ 56, 54, 53 }, // SDL_MESSAGEBOX_COLOR_BACKGROUND, { 56, 54, 53 }, /* SDL_MESSAGEBOX_COLOR_BACKGROUND, */
{ 209, 207, 205 }, // SDL_MESSAGEBOX_COLOR_TEXT, { 209, 207, 205 }, /* SDL_MESSAGEBOX_COLOR_TEXT, */
{ 140, 135, 129 }, // SDL_MESSAGEBOX_COLOR_BUTTON_BORDER, { 140, 135, 129 }, /* SDL_MESSAGEBOX_COLOR_BUTTON_BORDER, */
{ 105, 102, 99 }, // SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND, { 105, 102, 99 }, /* SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND, */
{ 205, 202, 53 }, // SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED, { 205, 202, 53 }, /* SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED, */
}; };
#define SDL_MAKE_RGB( _r, _g, _b ) ( ( ( Uint32 )( _r ) << 16 ) | \ #define SDL_MAKE_RGB( _r, _g, _b ) ( ( ( Uint32 )( _r ) << 16 ) | \

4
src/video/x11/SDL_x11mouse.c
View file

@ -230,8 +230,8 @@ X11_CreateSystemCursor(SDL_SystemCursor id)
default: default:
SDL_assert(0); SDL_assert(0);
return NULL; return NULL;
// X Font Cursors reference: /* X Font Cursors reference:
// http://tronche.com/gui/x/xlib/appendix/b/ http://tronche.com/gui/x/xlib/appendix/b/ */
case SDL_SYSTEM_CURSOR_ARROW: shape = XC_arrow; break; case SDL_SYSTEM_CURSOR_ARROW: shape = XC_arrow; break;
case SDL_SYSTEM_CURSOR_IBEAM: shape = XC_xterm; break; case SDL_SYSTEM_CURSOR_IBEAM: shape = XC_xterm; break;
case SDL_SYSTEM_CURSOR_WAIT: shape = XC_watch; break; case SDL_SYSTEM_CURSOR_WAIT: shape = XC_watch; break;

4
src/video/x11/SDL_x11opengl.c
View file

@ -460,8 +460,8 @@ X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int si
GLX_SLOW_VISUAL_EXT; GLX_SLOW_VISUAL_EXT;
} }
// If we're supposed to use DirectColor visuals, and we've got the EXT_visual_info /* If we're supposed to use DirectColor visuals, and we've got the
// extension, then add GLX_X_VISUAL_TYPE_EXT. EXT_visual_info extension, then add GLX_X_VISUAL_TYPE_EXT. */
if (X11_UseDirectColorVisuals() && if (X11_UseDirectColorVisuals() &&
_this->gl_data->HAS_GLX_EXT_visual_info) { _this->gl_data->HAS_GLX_EXT_visual_info) {
attribs[i++] = GLX_X_VISUAL_TYPE_EXT; attribs[i++] = GLX_X_VISUAL_TYPE_EXT;

11
src/video/x11/SDL_x11opengles.c
View file

@ -355,8 +355,10 @@ X11_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
{ {
int retval; 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) { if (!_this->gles_data) {
SDL_SetError("OpenGL not initialized"); 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"); SDL_SetError("Unable to make EGL context current");
retval = -1; retval = -1;
} }
// XSync(display, False);
/*
XSync(display, False);
*/
return (retval); return (retval);
} }

4
src/video/x11/SDL_x11video.c
View file

@ -293,8 +293,8 @@ X11_CreateDevice(int devindex)
return NULL; return NULL;
} }
// Need for threading gl calls. This is also required for the proprietary nVidia /* Need for threading gl calls. This is also required for the proprietary
// driver to be threaded. nVidia driver to be threaded. */
XInitThreads(); XInitThreads();
/* Initialize all variables that we clean on shutdown */ /* Initialize all variables that we clean on shutdown */