X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.h;h=2c0e34d3930ccc1b5379daff9adccf21c7cb6c9c;hb=d4d84c1d916f5bff3bb72be92e9d1383a25077c1;hp=dd2efbb44868dc93301c4596480514149a891542;hpb=6fde36d3b264246e60a0674b0a0013c1c5434e38;p=gnulib.git

diff --git a/lib/readutmp.h b/lib/readutmp.h
index dd2efbb44..2c0e34d39 100644
--- a/lib/readutmp.h
+++ b/lib/readutmp.h
@@ -1,12 +1,11 @@
 /* Declarations for GNU's read utmp module.
 
-   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992-2007, 2009-2011 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by jla; revised by djm */
 
@@ -36,6 +34,11 @@
     /* HPUX 10.20 needs utmp.h, for the definition of e.g., UTMP_FILE.  */
 #   include <utmp.h>
 #  endif
+#  if defined _THREAD_SAFE && defined UTMP_DATA_INIT
+    /* When including both utmp.h and utmpx.h on AIX 4.3, with _THREAD_SAFE
+       defined, work around the duplicate struct utmp_data declaration.  */
+#   define utmp_data gl_aix_4_3_workaround_utmp_data
+#  endif
 #  include <utmpx.h>
 #  define UTMP_STRUCT_NAME utmpx
 #  define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_tv.tv_sec)
@@ -70,7 +73,7 @@
 
 #  include <utmp.h>
 #  if !HAVE_DECL_GETUTENT
-    struct utmp *getutent();
+    struct utmp *getutent (void);
 #  endif
 #  define UTMP_STRUCT_NAME utmp
 #  define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_time)
@@ -194,9 +197,9 @@ enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) };
 #  define UT_TYPE_USER_PROCESS(U) 0
 # endif
 
-# define IS_USER_PROCESS(U)					\
-   (UT_USER (U)[0]						\
-    && (UT_TYPE_USER_PROCESS (U)				\
+# define IS_USER_PROCESS(U)                                     \
+   (UT_USER (U)[0]                                              \
+    && (UT_TYPE_USER_PROCESS (U)                                \
         || (UT_TYPE_NOT_DEFINED && UT_TIME_MEMBER (U) != 0)))
 
 /* Options for read_utmp.  */
@@ -208,6 +211,6 @@ enum
 
 char *extract_trimmed_name (const STRUCT_UTMP *ut);
 int read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf,
-	       int options);
+               int options);
 
 #endif /* __READUTMP_H__ */