Scrub pwd.h and grp.h handling so we don't have to play any

silly games.
 -Erik

14 files changed, 14 insertions, 14 deletions

diff --git a/libpwdgrp/__getgrent.c b/libpwdgrp/__getgrent.c
index 571da3fc3..39cf1890a 100644
--- a/libpwdgrp/__getgrent.c
+++ b/libpwdgrp/__getgrent.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include "grp.h"
+#include "grp_.h"
 
 /*
  * Define GR_SCALE_DYNAMIC if you want grp to dynamically scale its read buffer
diff --git a/libpwdgrp/__getpwent.c b/libpwdgrp/__getpwent.c
index e406b8824..d553250f4 100644
--- a/libpwdgrp/__getpwent.c
+++ b/libpwdgrp/__getpwent.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 #define PWD_BUFFER_SIZE 256
 
diff --git a/libpwdgrp/fgetgrent.c b/libpwdgrp/fgetgrent.c
index c5d63e05f..1492a1a95 100644
--- a/libpwdgrp/fgetgrent.c
+++ b/libpwdgrp/fgetgrent.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "grp.h"
+#include "grp_.h"
 
 struct group *fgetgrent(FILE * file)
 {
diff --git a/libpwdgrp/fgetpwent.c b/libpwdgrp/fgetpwent.c
index 6537600ff..54c3b3adc 100644
--- a/libpwdgrp/fgetpwent.c
+++ b/libpwdgrp/fgetpwent.c
@@ -22,7 +22,7 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 struct passwd *fgetpwent(FILE * file)
 {
diff --git a/libpwdgrp/getgrgid.c b/libpwdgrp/getgrgid.c
index e70346a77..73f0cca97 100644
--- a/libpwdgrp/getgrgid.c
+++ b/libpwdgrp/getgrgid.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "grp.h"
+#include "grp_.h"
 
 struct group *getgrgid(const gid_t gid)
 {
diff --git a/libpwdgrp/getgrnam.c b/libpwdgrp/getgrnam.c
index 62b2b26ca..919622ea1 100644
--- a/libpwdgrp/getgrnam.c
+++ b/libpwdgrp/getgrnam.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "grp.h"
+#include "grp_.h"
 
 struct group *getgrnam(const char *name)
 {
diff --git a/libpwdgrp/getpw.c b/libpwdgrp/getpw.c
index ca11188aa..d46e2c7da 100644
--- a/libpwdgrp/getpw.c
+++ b/libpwdgrp/getpw.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <errno.h>
 #include <stdio.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 int getpw(uid_t uid, char *buf)
 {
diff --git a/libpwdgrp/getpwnam.c b/libpwdgrp/getpwnam.c
index 88a31f8c2..524fa09be 100644
--- a/libpwdgrp/getpwnam.c
+++ b/libpwdgrp/getpwnam.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 
 struct passwd *getpwnam(const char *name)
diff --git a/libpwdgrp/getpwuid.c b/libpwdgrp/getpwuid.c
index 776ed12da..819c874ac 100644
--- a/libpwdgrp/getpwuid.c
+++ b/libpwdgrp/getpwuid.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 struct passwd *getpwuid(uid_t uid)
 {
diff --git a/libpwdgrp/grent.c b/libpwdgrp/grent.c
index 5b1cb6823..df9195599 100644
--- a/libpwdgrp/grent.c
+++ b/libpwdgrp/grent.c
@@ -28,7 +28,7 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include "grp.h"
+#include "grp_.h"
 
 static int grp_fd = -1;
 
diff --git a/libpwdgrp/initgroups.c b/libpwdgrp/initgroups.c
index 9b5dcbcb2..57b25f343 100644
--- a/libpwdgrp/initgroups.c
+++ b/libpwdgrp/initgroups.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include "grp.h"
+#include "grp_.h"
 
 /*
  * Define GR_SCALE_DYNAMIC if you want grp to dynamically scale its read buffer
diff --git a/libpwdgrp/putpwent.c b/libpwdgrp/putpwent.c
index 88dffc952..de285ebaf 100644
--- a/libpwdgrp/putpwent.c
+++ b/libpwdgrp/putpwent.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "pwd.h"
+#include "pwd_.h"
 
 int putpwent(const struct passwd *passwd, FILE * f)
 {
diff --git a/libpwdgrp/pwent.c b/libpwdgrp/pwent.c
index 84bd6176b..1f4239741 100644
--- a/libpwdgrp/pwent.c
+++ b/libpwdgrp/pwent.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "pwd.h"
+#include "pwd_.h"
 #include <fcntl.h>
 
 /*
diff --git a/libpwdgrp/setgroups.c b/libpwdgrp/setgroups.c
index c9b86f016..c3af1ea77 100644
--- a/libpwdgrp/setgroups.c
+++ b/libpwdgrp/setgroups.c
@@ -35,7 +35,7 @@
 /* This is needed for libc5 */
 #include <asm/unistd.h>
 #endif
-#include "grp.h"
+#include "grp_.h"
 
 //#define __NR_setgroups        81
 _syscall2(int, setgroups, size_t, size, const gid_t *, list);