h/utils.h: Move in PLURALS() macro from h/mh.h.

diff --git a/h/mh.h b/h/mh.h
index 22e3a0b5d3d2bc563875d2f23966bd49906275be..77671f8d39bd896552f8fda8459410a6e1adbf59 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -51,15 +51,6 @@ typedef unsigned char  boolean;  /* not int so we can pack in a structure */
 /* FENDNULL fends off NULL by giving an empty string instead. */
 #define FENDNULL(s) ((s) ? (s) : "")
 
 /* FENDNULL fends off NULL by giving an empty string instead. */
 #define FENDNULL(s) ((s) ? (s) : "")
 

-/* PLURALS gives a pointer to the string "s" when n isn't 1, and to the
- * empty string "" when it is.  Suitable for obtaining the plural `s'
- * used for English nouns.  It treats -1 as plural, as does GNU gettext.
- * Having output vary for plurals is annoying for those writing parsers;
- * better to phrase the output such that no test is needed, e.g.
- * "messages found: 42". */
-extern const char plurals[];
-#define PLURALS(n) (plurals + ((n) == 1))
-

 /*
  * char array that keeps track of size in both bytes and characters
  * Usage note:
 /*
  * char array that keeps track of size in both bytes and characters
  * Usage note:

diff --git a/h/utils.h b/h/utils.h
index 56dec3092de1c1e5773dd47c14a582d0ee26d50d..19d71563f98ee8048871091eafefd9c02f1ef8d9 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -1,6 +1,15 @@
 /* utils.h -- utility prototypes
  */
 
 /* utils.h -- utility prototypes
  */
 

+/* PLURALS gives a pointer to the string "s" when n isn't 1, and to the
+ * empty string "" when it is.  Suitable for obtaining the plural `s'
+ * used for English nouns.  It treats -1 as plural, as does GNU gettext.
+ * Having output vary for plurals is annoying for those writing parsers;
+ * better to phrase the output such that no test is needed, e.g.
+ * "messages found: 42". */
+extern const char plurals[];
+#define PLURALS(n) (plurals + ((n) == 1))
+

 /* Call malloc(3), exiting on NULL return. */
 void *mh_xmalloc(size_t size);
 
 /* Call malloc(3), exiting on NULL return. */
 void *mh_xmalloc(size_t size);