X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=h%2Fmh.h;h=280249e15f1d484cc97d4042b5701f809d393956;hb=HEAD;hp=20346b6b7e9a83271014661e6f20dbae363c0674;hpb=1fadbab6f4c38dbd151898ecc158b3dc28e87f16;p=mmh

diff --git a/h/mh.h b/h/mh.h
index 20346b6..280249e 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -38,8 +38,26 @@ typedef unsigned char  boolean;  /* not int so we can pack in a structure */
 */
 #if __GNUC__ > 2
 # define NORETURN __attribute__((__noreturn__))
+# define CONST __attribute__((const))
+# define MALLOC __attribute__((malloc))
+# define NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
+# define PURE __attribute__((pure))
+# define ENDNULL __attribute__((sentinel))
 #else
 # define NORETURN
+# define CONST
+# define MALLOC
+# define NONNULL(...)
+# define PURE
+# define ENDNULL
+#endif
+
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
+# define ALLOC_SIZE(...) __attribute__((alloc_size(__VA_ARGS__)))
+# define CHECK_PRINTF(fmt, arg) __attribute__((format(printf, fmt, arg)))
+#else
+# define ALLOC_SIZE(...)
+# define CHECK_PRINTF(fmt, arg)
 #endif
 
 /*
@@ -203,6 +221,8 @@ struct msgs {
                            ** terminating NULL.
                            */
 
+#define MAXTEXTPERLN 78
+
 /* m_getfld2() returned data */
 struct field {
 	char name[NAMESZ];
@@ -220,7 +240,7 @@ enum state {
 	IOERR2 = -1,       /* Read error */
 	FLD2 = 0,          /* Header field returned */
 	BODY2,             /* Body line returned */
-	FILEEOF2,          /* Reached end of input file */
+	FILEEOF2           /* Reached end of input file */
 };
 
 #define NOUSE    0        /* draft being re-used */
@@ -288,7 +308,6 @@ extern char *msgprot;
 extern char *nmhstorage;
 extern char *nsequence;
 extern char *profile;
-extern char *psequence;
 extern char *rcvdistcomps;
 extern char *replcomps;
 extern char *replgroupcomps;
@@ -309,4 +328,5 @@ extern char *version;
 extern char *lib_version;
 extern char *whatnowproc;
 
+#include <h/charstring.h>
 #include <h/prototypes.h>