From 0d24495b15388eabdfb5c2c1742a73f046676013 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 15 Nov 2016 01:24:58 -0800 Subject: [PATCH] Removed unused constants Except for SDL_bmp.c where they are historically interesting and I've left them in. --- src/core/linux/SDL_udev.c | 1 - src/render/software/SDL_rotate.c | 5 ----- src/video/SDL_RLEaccel.c | 5 ----- src/video/SDL_bmp.c | 4 ++-- src/video/x11/SDL_x11opengl.c | 12 ------------ src/video/x11/SDL_x11window.c | 1 - 6 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/core/linux/SDL_udev.c b/src/core/linux/SDL_udev.c index a80b34434..351ecf3c7 100644 --- a/src/core/linux/SDL_udev.c +++ b/src/core/linux/SDL_udev.c @@ -280,7 +280,6 @@ SDL_UDEV_LoadLibrary(void) #define BITS_PER_LONG (sizeof(unsigned long) * 8) #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) #define OFF(x) ((x)%BITS_PER_LONG) -/* #define BIT(x) (1UL<> OFF(bit)) & 1) diff --git a/src/render/software/SDL_rotate.c b/src/render/software/SDL_rotate.c index 5813b9478..6b6c2fa09 100644 --- a/src/render/software/SDL_rotate.c +++ b/src/render/software/SDL_rotate.c @@ -76,11 +76,6 @@ to a situation where the program can segfault. */ #define GUARD_ROWS (2) -/* ! -\brief Lower limit of absolute zoom factor or rotation degrees. -*/ -/* #define VALUE_LIMIT 0.001 */ - /* ! \brief Returns colorkey info for a surface */ diff --git a/src/video/SDL_RLEaccel.c b/src/video/SDL_RLEaccel.c index 4f8b0e7fc..6eb8ecb34 100644 --- a/src/video/SDL_RLEaccel.c +++ b/src/video/SDL_RLEaccel.c @@ -90,11 +90,6 @@ #include "SDL_blit.h" #include "SDL_RLEaccel_c.h" -/* -#ifndef MAX -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#endif -*/ #ifndef MIN #define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c index 2cefcd1b5..2d9cf240b 100644 --- a/src/video/SDL_bmp.c +++ b/src/video/SDL_bmp.c @@ -43,8 +43,8 @@ /* Compression encodings for BMP files */ #ifndef BI_RGB #define BI_RGB 0 -/* #define BI_RLE8 1 */ -/* #define BI_RLE4 2 */ +#define BI_RLE8 1 +#define BI_RLE4 2 #define BI_BITFIELDS 3 #endif diff --git a/src/video/x11/SDL_x11opengl.c b/src/video/x11/SDL_x11opengl.c index c29f71de8..0f050f7b3 100644 --- a/src/video/x11/SDL_x11opengl.c +++ b/src/video/x11/SDL_x11opengl.c @@ -519,18 +519,6 @@ X11_GL_GetVisual(_THIS, Display * display, int screen) return vinfo; } -#if 0 -#ifndef GLXBadContext -#define GLXBadContext 0 -#endif -#ifndef GLXBadFBConfig -#define GLXBadFBConfig 9 -#endif -#ifndef GLXBadProfileARB -#define GLXBadProfileARB 13 -#endif -#endif - static int (*handler) (Display *, XErrorEvent *) = NULL; static const char *errorHandlerOperation = NULL; static int errorBase = 0; diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c index 7ed27baf8..0464728e3 100644 --- a/src/video/x11/SDL_x11window.c +++ b/src/video/x11/SDL_x11window.c @@ -44,7 +44,6 @@ #define _NET_WM_STATE_REMOVE 0l #define _NET_WM_STATE_ADD 1l -/* #define _NET_WM_STATE_TOGGLE 2l */ static Bool isMapNotify(Display *dpy, XEvent *ev, XPointer win) {