From b4080cefcb89a032203f15bf45711c75b7e05903 Mon Sep 17 00:00:00 2001 From: nhmall Date: Tue, 1 Nov 2022 12:52:22 -0400 Subject: [PATCH] more unnecessary #undef --- outdated/sys/amiga/amirip.c | 1 - outdated/sys/amiga/windefs.h | 5 ----- outdated/win/gnome/gnglyph.h | 3 ++- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/outdated/sys/amiga/amirip.c b/outdated/sys/amiga/amirip.c index ba17cbdf0..6d89b1ced 100644 --- a/outdated/sys/amiga/amirip.c +++ b/outdated/sys/amiga/amirip.c @@ -58,7 +58,6 @@ static xoff, yoff; /* image centering */ #undef red #undef green #undef blue -#undef index #ifdef _DCC #include #include diff --git a/outdated/sys/amiga/windefs.h b/outdated/sys/amiga/windefs.h index f8b2aeda3..9e59da82f 100644 --- a/outdated/sys/amiga/windefs.h +++ b/outdated/sys/amiga/windefs.h @@ -96,11 +96,6 @@ CLIPPING must be defined for the AMIGA version #define __asm /* DICE doesn't like __asm */ #endif -#ifndef __SASC_60 -#undef index -#define index strchr -#endif - #ifdef _DCC #include #else diff --git a/outdated/win/gnome/gnglyph.h b/outdated/win/gnome/gnglyph.h index 66d2e27bf..0e83e62d7 100644 --- a/outdated/win/gnome/gnglyph.h +++ b/outdated/win/gnome/gnglyph.h @@ -10,7 +10,9 @@ /* the prototypes in system headers contain useless argument names that trigger spurious warnings if gcc's `-Wshadow' option is used */ +#ifdef index #undef index +#endif #define index _hide_index_ #define time _hide_time_ @@ -18,7 +20,6 @@ #include #undef index -#define index strchr #undef time extern short glyph2tile[]; /* From tile.c */