X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=h%2Fnmh.h;h=aa15d4c8b9df347dc11038306285bf11fdd82fdf;hb=5ae78fd67db80de17a995b1bc637bf131cfe2bb5;hp=26eb0a2b0c031264b7a7dcbdc287872235fae74a;hpb=8529829823bebf483ab22fe8d24c96394647a298;p=mmh

diff --git a/h/nmh.h b/h/nmh.h
index 26eb0a2..aa15d4c 100644
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -4,60 +4,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
+#include <dirent.h>
+#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
+#include <locale.h>
+#include <limits.h>
 
 /*
 ** symbolic constants for lseek and fseek
@@ -85,17 +49,6 @@
 #endif
 
 /*
-** we should get this value from sysconf(_SC_NGROUPS_MAX)
-*/
-#ifndef NGROUPS_MAX
-# ifdef NGROUPS
-#  define NGROUPS_MAX NGROUPS
-# else
-#  define NGROUPS_MAX 16
-# endif
-#endif
-
-/*
 ** we should be getting this value from sysconf(_SC_OPEN_MAX)
 */
 #ifndef OPEN_MAX
@@ -109,12 +62,6 @@
 
 #include <signal.h>
 
-#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.