about summary refs log tree commit diff
path: root/sysdeps/gnu
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-21 13:39:55 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-21 13:39:55 -0700
commit20c07380db271009a735780514eee62ada8681b9 (patch)
treec2c2b223e58e46365437471b6b904683f3773aa1 /sysdeps/gnu
parentd8d1017e5ea0b5478a3c571fe12a233c9450d41b (diff)
downloadglibc-20c07380db271009a735780514eee62ada8681b9.tar.gz
glibc-20c07380db271009a735780514eee62ada8681b9.tar.xz
glibc-20c07380db271009a735780514eee62ada8681b9.zip
Rename __WORDSIZE_COMPAT32 to __WORDSIZE_TIME64_COMPAT32
Diffstat (limited to 'sysdeps/gnu')
-rw-r--r--sysdeps/gnu/bits/utmp.h7
-rw-r--r--sysdeps/gnu/bits/utmpx.h4
2 files changed, 5 insertions, 6 deletions
diff --git a/sysdeps/gnu/bits/utmp.h b/sysdeps/gnu/bits/utmp.h
index c13380ab8e..aed2750bba 100644
--- a/sysdeps/gnu/bits/utmp.h
+++ b/sysdeps/gnu/bits/utmp.h
@@ -1,6 +1,5 @@
 /* The `struct utmp' type, describing entries in the utmp file.  GNU version.
-   Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002
-   Free Software Foundation, Inc.
+   Copyright (C) 1993-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -36,7 +35,7 @@
    previous logins.  */
 struct lastlog
   {
-#if __WORDSIZE == 64 && defined __WORDSIZE_COMPAT32
+#ifdef __WORDSIZE_TIME64_COMPAT32
     int32_t ll_time;
 #else
     __time_t ll_time;
@@ -69,7 +68,7 @@ struct utmp
 /* The ut_session and ut_tv fields must be the same size when compiled
    32- and 64-bit.  This allows data files and shared memory to be
    shared between 32- and 64-bit applications.  */
-#if __WORDSIZE == 64 && defined __WORDSIZE_COMPAT32
+#ifdef __WORDSIZE_TIME64_COMPAT32
   int32_t ut_session;		/* Session ID, used for windowing.  */
   struct
   {
diff --git a/sysdeps/gnu/bits/utmpx.h b/sysdeps/gnu/bits/utmpx.h
index 87626f085a..f8716ca124 100644
--- a/sysdeps/gnu/bits/utmpx.h
+++ b/sysdeps/gnu/bits/utmpx.h
@@ -1,5 +1,5 @@
 /* Structures and definitions for the user accounting database.  GNU version.
-   Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -66,7 +66,7 @@ struct utmpx
 /* The fields ut_session and ut_tv must be the same size when compiled
    32- and 64-bit.  This allows files and shared memory to be shared
    between 32- and 64-bit applications.  */
-#if __WORDSIZE == 64 && defined __WORDSIZE_COMPAT32
+#ifdef __WORDSIZE_TIME64_COMPAT32
   __int32_t ut_session;		/* Session ID, used for windowing.  */
   struct
   {