X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Freadutmp.h;h=1e43a31e84dad5fad2ccd37638a9f92d810331d6;hb=a6694a282b6d9c86beacd77b65a30626af293ba1;hp=dd2efbb44868dc93301c4596480514149a891542;hpb=6fde36d3b264246e60a0674b0a0013c1c5434e38;p=gnulib.git
diff --git a/lib/readutmp.h b/lib/readutmp.h
index dd2efbb44..1e43a31e8 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 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 . */
/* 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
# 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
# define UTMP_STRUCT_NAME utmpx
# define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_tv.tv_sec)