svn commit: trunk/uClibc/libutil

[vapier at uclibc.org]

Author: vapier
Date: 2005-11-23 05:17:18 -0800 (Wed, 23 Nov 2005)
New Revision: 12497

Log:
import 32/64 bit compat support from glibc

Modified:
   trunk/uClibc/libutil/logout.c
   trunk/uClibc/libutil/logwtmp.c


Changeset:
Modified: trunk/uClibc/libutil/logout.c
===================================================================
--- trunk/uClibc/libutil/logout.c	2005-11-23 13:05:24 UTC (rev 12496)
+++ trunk/uClibc/libutil/logout.c	2005-11-23 13:17:18 UTC (rev 12497)
@@ -51,7 +51,16 @@
       memset (ut->ut_host, 0, sizeof ut->ut_host);
 #endif
 #if _HAVE_UT_TV - 0
+# if __WORDSIZE_COMPAT32 == 0
       gettimeofday (&ut->ut_tv, NULL);
+# else
+    {
+      struct timeval tv;
+      gettimeofday (&tv, NULL);
+      ut->ut_tv.tv_sec = tv.tv_sec;
+      ut->ut_tv.tv_usec = tv.tv_usec;
+    }
+# endif
 #else
       time (&ut->ut_time);
 #endif

Modified: trunk/uClibc/libutil/logwtmp.c
===================================================================
--- trunk/uClibc/libutil/logwtmp.c	2005-11-23 13:05:24 UTC (rev 12496)
+++ trunk/uClibc/libutil/logwtmp.c	2005-11-23 13:17:18 UTC (rev 12497)
@@ -37,7 +37,16 @@
     strncpy(lutmp.ut_line, line, sizeof(lutmp.ut_line)-1);
     strncpy(lutmp.ut_name, name, sizeof(lutmp.ut_name)-1);
     strncpy(lutmp.ut_host, host, sizeof(lutmp.ut_host)-1);
+#if __WORDSIZE_COMPAT32 == 0
     gettimeofday(&(lutmp.ut_tv), NULL);
+#else
+    {
+      struct timeval tv;
+      gettimeofday (&tv, NULL);
+      lutmp.ut_tv.tv_sec = tv.tv_sec;
+      lutmp.ut_tv.tv_usec = tv.tv_usec;
+    }
+#endif
 
     updwtmp(_PATH_WTMP, &(lutmp));
 }