[Refactor] #37353 SUPPORT_GAMMA のプリプロが有効であることを前提とし、プリプロ自体は削除 / Removed SUPPORT_GAMMA...

diff --git a/src/h-config.h b/src/h-config.h
index 38461fc..923dfcc 100644 (file)
--- a/src/h-config.h
+++ b/src/h-config.h
@@ -507,12 +507,6 @@
 
 
 /*
- * OPTION: Gamma correct X11 colours.
- */
- 
-#define SUPPORT_GAMMA
-
-/*
  * Hack -- Mach-O (native binary format of OS X) is basically a Un*x
  * but has Mac OS/Windows-like user interface
  */

diff --git a/src/maid-x11.c b/src/maid-x11.c
index 39d06e6..f1fd1ac 100644 (file)
--- a/src/maid-x11.c
+++ b/src/maid-x11.c
@@ -68,10 +68,8 @@
   ((unsigned)(keysym) >= 0xFF00)
 
 
-#ifdef SUPPORT_GAMMA
 static bool gamma_table_ready = FALSE;
 static int gamma_val = 0;
-#endif /* SUPPORT_GAMMA */
 
 
 /*
@@ -81,9 +79,6 @@ static unsigned long create_pixel(Display *dpy, byte red, byte green, byte blue)
 {
        Colormap cmap = DefaultColormapOfScreen(DefaultScreenOfDisplay(dpy));
        XColor xcolour;
-
-#ifdef SUPPORT_GAMMA
-
        if (!gamma_table_ready)
        {
                concptr str = getenv("ANGBAND_X11_GAMMA");
@@ -103,8 +98,6 @@ static unsigned long create_pixel(Display *dpy, byte red, byte green, byte blue)
                blue = gamma_table[blue];
        }
 
-#endif /* SUPPORT_GAMMA */
-
        /* Build the color */
        
        xcolour.red = red * 255;

diff --git a/src/util.c b/src/util.c
index 1e24481..7f66bb4 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -4919,8 +4919,6 @@ void tag_sort(tag_type elements[], int number)
        quicksort(elements, 0, number - 1);
 }
 
-#ifdef SUPPORT_GAMMA
-
 /* Table of gamma values */
 byte gamma_table[256];
 
@@ -5014,8 +5012,6 @@ void build_gamma_table(int gamma)
        }
 }
 
-#endif /* SUPPORT_GAMMA */
-
 
 /*
  * Add a series of keypresses to the "queue".

diff --git a/src/util.h b/src/util.h
index d040e50..c8c09f3 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -424,10 +424,8 @@ extern void roff_to_buf(concptr str, int wlen, char *tbuf, size_t bufsize);
 
 extern void tag_sort(tag_type elements[], int number);
 
-#ifdef SUPPORT_GAMMA
 extern byte gamma_table[256];
 extern void build_gamma_table(int gamma);
-#endif /* SUPPORT_GAMMA */
 
 extern size_t my_strcpy(char *buf, concptr src, size_t bufsize);
 extern size_t my_strcat(char *buf, concptr src, size_t bufsize);