Removed or protected some unused macros.

diff --git a/sbr/client.c b/sbr/client.c
index 763b2a4cb6623a9ad9fafe3ebdfc9874b79ee5ea..7ae356addd6aa2b5a72eb5cd5f32656b1222023b 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 97849198a13cc40e8253b088e47f43eb19195a4f..2bf1821089bdeba832e1158426a4d76c2873a15e 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 b3c81ff0ed46391e65af5ba97e8a0536c79fbe02..5da5e7652d32a9943888e2ea12b89be562e5c026 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 1dcba6a57cdbd642e8eb9bf2ce28d7203ab411e8..9310ae1a84a4588f764a6b6c5d345a0cc91508dd 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 {