From e0953783024a113b186547aca186777f9ce3b798 Mon Sep 17 00:00:00 2001 From: George Burgess IV Date: Fri, 9 Sep 2016 23:43:19 -0700 Subject: pinky,who: remove redeclarations of ttyname Given that `ttyname` is already conditionally declared in src/system.h, other declarations are redundant and problematic for example in ChromeOS which has a new FORTIFY implementation that, as an artifact of how it's implemented, causes the compiler to complain if certain standard library functions are redeclared without special compiler-specific attributes. * src/pinky.c: Remove declaration (which was unused anyway). * src/who.c: Remove declaration. * src/system.h (getlogin, getuid, geteuid, getgrgid, getpwuid, ttyname): Add the parameter type to the declarations to avoid warnings when these backup declarations are used. --- src/system.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/system.h') diff --git a/src/system.h b/src/system.h index 986a6c786..1b7a0fbb3 100644 --- a/src/system.h +++ b/src/system.h @@ -197,23 +197,23 @@ select_plural (uintmax_t n) #define STRNCMP_LIT(s, lit) strncmp (s, "" lit "", sizeof (lit) - 1) #if !HAVE_DECL_GETLOGIN -char *getlogin (); +char *getlogin (void); #endif #if !HAVE_DECL_TTYNAME -char *ttyname (); +char *ttyname (int); #endif #if !HAVE_DECL_GETEUID -uid_t geteuid (); +uid_t geteuid (void); #endif #if !HAVE_DECL_GETPWUID -struct passwd *getpwuid (); +struct passwd *getpwuid (uid_t); #endif #if !HAVE_DECL_GETGRGID -struct group *getgrgid (); +struct group *getgrgid (gid_t); #endif /* Interix has replacements for getgr{gid,nam,ent}, that don't @@ -235,7 +235,7 @@ struct group *getgrgid (); #endif #if !HAVE_DECL_GETUID -uid_t getuid (); +uid_t getuid (void); #endif #include "xalloc.h" -- cgit v1.2.3-54-g00ecf