rpms/glibc/devel glibc-time.patch,NONE,1.1 glibc.spec,1.189,1.190

[fedora-cvs-commits at redhat.com]

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12727

Modified Files:
	glibc.spec 
Added Files:
	glibc-time.patch 
Log Message:
2.3.90-20


glibc-time.patch:
 time.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE glibc-time.patch ---
2005-12-20  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
	use sysdeps/unix/time.c implementation.

--- libc/sysdeps/unix/sysv/linux/time.c.jj	2005-12-20 08:49:43.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/time.c	2005-12-20 12:49:42.000000000 +0100
@@ -21,6 +21,7 @@
 
 #include <sysdep.h>
 
+#ifdef __NR_time
 
 time_t
 time (time_t *t)
@@ -33,3 +34,9 @@ time (time_t *t)
   return res;
 }
 libc_hidden_def (time)
+
+#else
+
+#include <sysdeps/unix/time.c>
+
+#endif


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- glibc.spec	20 Dec 2005 11:37:17 -0000	1.189
+++ glibc.spec	20 Dec 2005 11:51:46 -0000	1.190
@@ -34,6 +34,7 @@
 Patch1: %{name}-ppc-assume.patch
 Patch2: %{name}-ia64-lib64.patch
 Patch3: glibc-ia64-ulps.patch
+Patch4: glibc-time.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
@@ -242,6 +243,7 @@
 %endif
 %endif
 %patch3 -p1
+%patch4 -p1
 
 # Hack till glibc-kernheaders get updated, argh
 mkdir asm