mhshow/test-charset: Test iconv(1)'s result, not just its exit status.

[nmh] / h / mh.h

diff --git a/h/mh.h b/h/mh.h
index abec7c889f02da8ef3f204ec40d266e30d6526fd..a97a2e4383e3187af571cf58680c03dee24dcf5b 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -22,14 +22,6 @@
  */
 #define NMH_BUFSIZ  max(BUFSIZ, 8192)
 
-#ifndef FALSE
-#define FALSE false
-#endif
-#ifndef TRUE
-#define TRUE true
-#endif
-typedef unsigned char  boolean;  /* not int so we can pack in a structure */
-
 /* If we're using gcc then tell it extra information so it can do more
  * compile-time checks. */
 #if __GNUC__ > 2
@@ -39,7 +31,6 @@ typedef unsigned char  boolean;  /* not int so we can pack in a structure */
 #define NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
 #define PURE __attribute__((pure))
 #define ENDNULL __attribute__((sentinel))
-#define NMH_UNUSED(i) (void) i
 #else
 #define NORETURN
 #define CHECK_PRINTF(fmt, arg)
@@ -49,7 +40,6 @@ typedef unsigned char  boolean;  /* not int so we can pack in a structure */
 #define NONNULL(...)
 #define PURE
 #define ENDNULL
-#define NMH_UNUSED(i) i
 #endif
 
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
@@ -60,6 +50,9 @@ typedef unsigned char  boolean;  /* not int so we can pack in a structure */
 #define CHECK_PRINTF(fmt, arg)
 #endif
 
+/* Silence the compiler's "unused variable" warning. */
+#define NMH_UNUSED(i) (void)i
+
 /* DIM gives the number of elements in the one-dimensional array a. */
 #define DIM(a) (sizeof (a) / sizeof (*(a)))
 
@@ -519,6 +512,4 @@ extern char *version_str;
 extern char *whatnowproc;
 extern char *whomproc;
 
-extern void (*done) (int) NORETURN;
-
 #include <h/prototypes.h>