Fixed flex fixups to not break LFLAGS.

[nmh] / h / nmh.h

diff --git a/h/nmh.h b/h/nmh.h
index 8ff4ba8710733478048ccca0ce705e8b8e3a6fad..07f7240b1ca1b28a1ce90203ec653635dcba66c1 100644 (file)
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -1,17 +1,31 @@
-
-/*
- * nmh.h -- system configuration header file
+/* nmh.h -- system configuration header file
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
+#ifndef NDEBUG
+  /* See etc/gen-ctype-checked.c. */
+# include <sbr/ctype-checked.h>
+#endif
+#include <assert.h>
+
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# define bool int
+# define true 1
+# define false 0
+#endif
+
 #include <sys/stat.h>
+#include <sys/wait.h>
 
 # include <dirent.h>
-#define NLENGTH(dirent) strlen((dirent)->d_name)
 
 #include <stdlib.h>
 #include <stdarg.h>
@@ -21,21 +35,9 @@
 # include <sys/param.h>
 #endif
 
-# include <locale.h>
-# include <limits.h>
-
-/*
- * symbolic constants for lseek and fseek
- */
-#ifndef SEEK_SET
-# define SEEK_SET 0
-#endif
-#ifndef SEEK_CUR
-# define SEEK_CUR 1
-#endif
-#ifndef SEEK_END
-# define SEEK_END 2
-#endif
+#include <locale.h>
+#include <limits.h>
+#include <errno.h>
 
 /*
  * we should be getting this value from pathconf(_PC_PATH_MAX)
@@ -72,47 +74,13 @@
 # endif
 #endif
 
-#include <signal.h>
- 
-#define bcmp(b1,b2,length)      memcmp(b1, b2, length)
-#define bcopy(b1,b2,length)     memcpy (b2, b1, length)
-#define bcpy(b1,b2,length)      memcmp (b1, b2, length)
-#define bzero(b,length)         memset (b, 0, length)
+#ifndef HAVE_GETLINE
+ssize_t getline(char **lineptr, size_t *n, FILE *stream);
+#endif
 
 /*
- * If your stat macros are broken,
- * we will just undefine them.
+ * Defaults for programs if they aren't configured in a user's profile
  */
-#ifdef STAT_MACROS_BROKEN
-# ifdef S_ISBLK
-#  undef S_ISBLK
-# endif 
-# ifdef S_ISCHR
-#  undef S_ISCHR
-# endif 
-# ifdef S_ISDIR
-#  undef S_ISDIR
-# endif 
-# ifdef S_ISFIFO
-#  undef S_ISFIFO
-# endif 
-# ifdef S_ISLNK
-#  undef S_ISLNK
-# endif 
-# ifdef S_ISMPB
-#  undef S_ISMPB
-# endif 
-# ifdef S_ISMPC
-#  undef S_ISMPC
-# endif 
-# ifdef S_ISNWK
-#  undef S_ISNWK
-# endif 
-# ifdef S_ISREG
-#  undef S_ISREG
-# endif 
-# ifdef S_ISSOCK
-#  undef S_ISSOCK
-# endif 
-#endif  /* STAT_MACROS_BROKEN.  */
 
+#define DEFAULT_PAGER "more"
+#define DEFAULT_EDITOR "vi"