Dont include grp.h from system.h, dont bother checking in configure either

- no much point conditionalizing something we can't live without
- just two places need, no point polluting include space everywhere

diff --git a/build/names.c b/build/names.c
index 4e8b1cc..41f6f58 100644 (file)
--- a/build/names.c
+++ b/build/names.c
@@ -5,7 +5,7 @@
 
 
 #include "system.h"
-
+#include <grp.h>
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
 #include "debug.h"

diff --git a/configure.ac b/configure.ac
index 579198d..a81e6fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -377,7 +377,7 @@ AC_HEADER_TIME
 
 AC_CHECK_HEADERS(locale.h)
 AC_CHECK_HEADERS(limits.h)
-AC_CHECK_HEADERS(fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h)
+AC_CHECK_HEADERS(fcntl.h getopt.h memory.h netdb.h pwd.h utime.h)
 
 AC_CHECK_HEADERS(sys/ipc.h sys/socket.h sys/select.h)
 AC_CHECK_HEADERS(sys/types.h sys/stdtypes.h)

diff --git a/lib/misc.c b/lib/misc.c
index 3d7fc14..55ad6fa 100644 (file)
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -4,16 +4,16 @@
 
 #include "system.h"
 
-/* just to put a marker in librpm.a */
-const char * const RPMVERSION = VERSION;
-
+#include <grp.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmstring.h>
 
 #include "lib/misc.h"
-
 #include "debug.h"
 
+/* just to put a marker in librpm.a */
+const char * const RPMVERSION = VERSION;
+
 /* unameToUid(), uidTouname() and the group variants are really poorly
    implemented. They really ought to use hash tables. I just made the
    guess that most files would be owned by root or the same person/group

diff --git a/system.h b/system.h
index 10a9cf7..da006b4 100644 (file)
--- a/system.h
+++ b/system.h
@@ -163,10 +163,6 @@ char *realpath(const char *path, char resolved_path []);
 #include <getopt.h>
 #endif
 
-#if HAVE_GRP_H
-#include <grp.h>
-#endif
-
 #if HAVE_LIMITS_H
 #include <limits.h>
 #endif