Removed or protected some unused macros.

diff --git a/sbr/client.c b/sbr/client.c
index 763b2a4..7ae356a 100644 (file)
--- a/sbr/client.c
+++ b/sbr/client.c
@@ -16,9 +16,6 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 
-#define        TRUE         1
-#define        FALSE        0
-
 #define        MAXARGS   1000
 
 /*

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 9784919..2bf1821 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -22,8 +22,6 @@
 #  include <wchar.h>
 #endif
 
-#define        NFMTS MAXARGS
-
 extern char *formataddr ();    /* hook for custom address formatting */
 
 #ifdef LBL

diff --git a/sbr/uprf.c b/sbr/uprf.c
index b3c81ff..5da5e76 100644 (file)
--- a/sbr/uprf.c
+++ b/sbr/uprf.c
@@ -9,8 +9,10 @@
 
 #include <h/mh.h>
 
-#define TO_LOWER 040
-#define NO_MASK  000
+#ifndef LOCALE
+# define TO_LOWER 040
+# define NO_MASK  000
+#endif
 
 
 int

diff --git a/uip/inc.c b/uip/inc.c
index 1dcba6a..9310ae1 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -109,7 +109,9 @@ static struct swit switches[] = {
  * flags for the mail source
  */
 #define INC_FILE  0
-#define INC_POP   1
+#ifdef POP
+# define INC_POP   1
+#endif /* POP */
 
 static int inc_type;
 static struct Maildir_entry {