about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/gnu/bits/utmp.h7
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 073acf85dd..f1a0d41f2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-26  Ulrich Drepper  <drepper@cygnus.com>
 
+	* sysdeps/gnu/bits/utmp.h: Don't prepend exit_status elements with
+	__ since utmp.h is not mentioned in any standard.
+
 	* sysdeps/unix/sysv/linux/i386/clone.S: When not using PIC don't
 	use jecxz since the label might be far away.
 
diff --git a/sysdeps/gnu/bits/utmp.h b/sysdeps/gnu/bits/utmp.h
index 743257d302..d07486e9c0 100644
--- a/sysdeps/gnu/bits/utmp.h
+++ b/sysdeps/gnu/bits/utmp.h
@@ -1,5 +1,5 @@
 /* The `struct utmp' type, describing entries in the utmp file.  GNU version.
-   Copyright (C) 1993, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -44,13 +44,8 @@ struct lastlog
    type is used in `struct utmp' below.  */
 struct exit_status
   {
-#ifdef __USE_GNU
     short int e_termination;	/* Process termination status.  */
     short int e_exit;		/* Process exit status.  */
-#else
-    short int __e_termination;	/* Process termination status.  */
-    short int __e_exit;		/* Process exit status.  */
-#endif
   };