X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..3865f55b4195bac67932ac3aacbd8f3c53239b62:/h/nmh.h

diff --git a/h/nmh.h b/h/nmh.h
index f1711d5c..8ff4ba87 100644
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -5,60 +5,24 @@
 
 #include <config.h>
 
-#ifdef HAVE_UNISTD_H
-# include <sys/types.h>
-# include <unistd.h>
-#endif
-
+#include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/stat.h>
 
-#if HAVE_DIRENT_H
 # include <dirent.h>
-# define NLENGTH(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NLENGTH(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#define NLENGTH(dirent) strlen((dirent)->d_name)
 
+#include <stdlib.h>
 #include <stdarg.h>
-
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-/* An ANSI string.h and pre-ANSI memory.h might conflict.  */
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif /* not STDC_HEADERS and HAVE_MEMORY_H */
-#else   /* not STDC_HEADERS and not HAVE_STRING_H */
-# include <strings.h>
-/* memory.h and strings.h conflict on some systems.  */
-#endif /* not STDC_HEADERS and not HAVE_STRING_H */
+#include <string.h>
 
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
 
-#ifdef HAVE_LOCALE_H
 # include <locale.h>
-#endif
-
-#ifdef HAVE_LIMITS_H
 # include <limits.h>
-#endif
 
 /*
  * symbolic constants for lseek and fseek
@@ -115,12 +79,6 @@
 #define bcpy(b1,b2,length)      memcmp (b1, b2, length)
 #define bzero(b,length)         memset (b, 0, length)
 
-#ifdef HAVE_KILLPG
-# define KILLPG(pgrp,sig) killpg(pgrp,sig);
-#else
-# define KILLPG(pgrp,sig) kill((-pgrp),sig);
-#endif
-
 /*
  * If your stat macros are broken,
  * we will just undefine them.