diff options
| author | George Burgess IV <gbiv@chromium.org> | 2016-09-09 23:43:19 -0700 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2016-09-11 12:46:02 +0100 |
| commit | e0953783024a113b186547aca186777f9ce3b798 (patch) | |
| tree | 89e12f2dc9d0df753dda7c30a26d84adc51130e2 /src/system.h | |
| parent | 677ae07083f41754fc9d3c7a0559248063908e30 (diff) | |
| download | coreutils-e0953783024a113b186547aca186777f9ce3b798.tar.xz | |
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.
Diffstat (limited to 'src/system.h')
| -rw-r--r-- | src/system.h | 12 |
1 files changed, 6 insertions, 6 deletions
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" |