From 1043a80d1f31371e63fa03570ccd1f75de613954 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sun, 14 Feb 2021 16:47:04 -0800 Subject: [PATCH] Remove unnecessary (re)definitions of TRUE/FALSE (#356) --- inc/devif.h | 8 -------- inc/kbdif.h | 6 ------ src/main.c | 3 --- src/mnwevent.c | 5 ----- src/picture.c | 3 --- src/timer.c | 2 -- src/truecolor.c | 3 --- 7 files changed, 30 deletions(-) diff --git a/inc/devif.h b/inc/devif.h index 104c0f9..21de214 100644 --- a/inc/devif.h +++ b/inc/devif.h @@ -285,14 +285,6 @@ typedef struct #define mid(a, b, c) max( min( b, max( a, c ), min( a, max( b, c )))) #endif /* mid */ -#ifndef FALSE -#define FALSE 0 -#endif /* FALSE */ - -#ifndef TRUE -#define TRUE !FALSE -#endif /* TRUE */ - #define MINKEYEVENT 2 /* leave 2 words for read,write offsets */ #define NUMBEROFKEYEVENTS 383 diff --git a/inc/kbdif.h b/inc/kbdif.h index 6df02da..bfe3de4 100644 --- a/inc/kbdif.h +++ b/inc/kbdif.h @@ -31,10 +31,4 @@ typedef struct { int device_locked; #endif /* DOS */ } KbdInterfaceRec, *KbdInterface; - - -#ifndef TRUE -#define FALSE 0 -#define TRUE !FALSE -#endif /* TRUE */ #endif /* KBDIF_H */ diff --git a/src/main.c b/src/main.c index b870c84..ec59528 100644 --- a/src/main.c +++ b/src/main.c @@ -243,9 +243,6 @@ extern int maxpages; extern int *Lisp_errno; extern int Dummy_errno; /* If errno cell is not provided by Lisp, dummy_errno is used. */ -#define FALSE 0 -#define TRUE !FALSE - char sysout_name[MAXPATHLEN]; /* Set by read_Xoption, in the X version. */ int sysout_size = 0; /* ditto */ diff --git a/src/mnwevent.c b/src/mnwevent.c index 9d78ed0..04779a9 100644 --- a/src/mnwevent.c +++ b/src/mnwevent.c @@ -26,11 +26,6 @@ #include "adr68k.h" #include "cell.h" -#ifndef FALSE -#define FALSE 0 -#define TRUE !FALSE -#endif /* FALSE */ - extern XEvent report; extern DLword *CTopMNWEvent; diff --git a/src/picture.c b/src/picture.c index 19f9a68..31f3dde 100644 --- a/src/picture.c +++ b/src/picture.c @@ -23,9 +23,6 @@ #include "adr68k.h" #include "lspglob.h" -#define FALSE 0 -#define TRUE !FALSE - #include "picture.h" #define min(x, y) (((x) > (y)) ? (y) : (x)) diff --git a/src/timer.c b/src/timer.c index 81e81b1..2e0ab8c 100644 --- a/src/timer.c +++ b/src/timer.c @@ -88,8 +88,6 @@ extern DspInterface currentdsp; int TIMEOUT_TIME; /* For file system timeout */ #ifdef XWINDOW -#define FALSE 0 -#define TRUE !FALSE volatile sig_atomic_t Event_Req = FALSE; #endif /* XWINDOW */ diff --git a/src/truecolor.c b/src/truecolor.c index d0e6ffd..e85b15a 100644 --- a/src/truecolor.c +++ b/src/truecolor.c @@ -24,9 +24,6 @@ #include "picture.h" -#define FALSE 0 -#define TRUE !FALSE - #define COLOR_INIT 0 #define COLOR_OVERLAYREGION 1 #define COLOR_VIDEOREGION 2