rpms/openoffice.org/devel openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch, 1.1, 1.2

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25667

Modified Files:
	openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch 
Log Message:
avoid the other bustage for now

openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch:

Index: openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch	16 Aug 2007 12:03:42 -0000	1.1
+++ openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch	16 Aug 2007 12:27:32 -0000	1.2
@@ -42,3 +42,27 @@
    gettimeofday( &currentTime, NULL );
    
    nSeconds = (sal_uInt32)( currentTime.tv_sec - startTime.tv_sec );
+Index: source/alloc_cache.c
+===================================================================
+RCS file: /cvs/porting/sal/rtl/source/alloc_cache.c,v
+retrieving revision 1.3
+diff -u -r1.3 alloc_cache.c
+--- openoffice.org.orig/sal/rtl/source/alloc_cache.c	20 Jun 2006 04:28:39 -0000	1.3
++++ openoffice.org/sal/rtl/source/alloc_cache.c	16 Aug 2007 12:26:47 -0000
+@@ -1393,12 +1393,12 @@
+ {
+ 	if (seconds > 0)
+ 	{
+-		struct timeval  now;
++		time_t now;
+ 		struct timespec wakeup;
+ 
+-		gettimeofday(&now, 0);
+-		wakeup.tv_sec  = now.tv_sec + (seconds);
+-		wakeup.tv_nsec = now.tv_usec * 1000;
++		now = time(NULL);
++		wakeup.tv_sec  = now + (seconds);
++		wakeup.tv_nsec = 0;
+ 
+ 		(void) pthread_cond_timedwait (
+ 			&(g_cache_list.m_update_cond),