From: Jim Meyering <jim@meyering.net>
Date: Sat, 5 Jul 1997 08:25:58 +0000 (+0000)
Subject: Redefine/undef getusershell around inclusion of <unistd.h>
X-Git-Tag: v2.22-rc1~347^2~10^2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=132449e4daddd5452885d4807134aab7a7a6d377;p=thirdparty%2Futil-linux.git

Redefine/undef getusershell around inclusion of <unistd.h>
(via system.h) so Cray's int-returning prototype doesn't conflict
with our char*-returning one.
---

diff --git a/login-utils/su.c b/login-utils/su.c
index 96b47552d8..26c65fe7bb 100644
--- a/login-utils/su.c
+++ b/login-utils/su.c
@@ -75,8 +75,16 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
+
+/* Hide any system prototype for getusershell.
+   This is necessary because some Cray systems have a conflicting
+   prototype (returning `int') in <unistd.h>.  */
+#define getusershell _getusershell_sys_proto_
+
 #include "system.h"
 
+#undef getusershell
+
 #if HAVE_SYSLOG_H && HAVE_SYSLOG
 # include <syslog.h>
 #else