Add a couple more standard macros. Fix the header.

diff --git a/macros.h b/macros.h
index 6af623f1c1f3bbb8604f0f4029ea14cce3ad8ffd..4dd6901fa0d3626f8c7cfdbaeeaaa184137bc1a3 100644 (file)
--- a/macros.h
+++ b/macros.h
@@ -1,5 +1,8 @@
 /* -*-c-*-
 /* -*-c-*-

- Handy macrosose]]
+ *
+ * $Id$
+ *
+ * Handy macros

  *
  * (c) 2003 Straylight/Edgeware
  */
  *
  * (c) 2003 Straylight/Edgeware
  */


@@ -35,6 +38,12 @@
 
 #define N(v) (sizeof(v)/sizeof(*v))
 
 
 #define N(v) (sizeof(v)/sizeof(*v))
 

+#define MLIB__STR(x) #x
+#define STR(x) MLIB__STR(x)
+
+#define MLIB__GLUE(x, y) x##y
+#define GLUE(x, y) MLIB__GLUE(x, y)
+

 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus