Commit 0d24495b15388eabdfb5c2c1742a73f046676013
2016-11-15T01:24:58
Removed unused constants Except for SDL_bmp.c where they are historically interesting and I've left them in.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
diff --git a/src/core/linux/SDL_udev.c b/src/core/linux/SDL_udev.c
index a80b344..351ecf3 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(x)) */
#define LONG(x) ((x)/BITS_PER_LONG)
#define test_bit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
diff --git a/src/render/software/SDL_rotate.c b/src/render/software/SDL_rotate.c
index 5813b94..6b6c2fa 100644
--- a/src/render/software/SDL_rotate.c
+++ b/src/render/software/SDL_rotate.c
@@ -77,11 +77,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
*/
static Uint32
diff --git a/src/video/SDL_RLEaccel.c b/src/video/SDL_RLEaccel.c
index 4f8b0e7..6eb8ecb 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 2cefcd1..2d9cf24 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 c29f71d..0f050f7 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 7ed27ba..0464728 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)
{