rpms/glib2/devel glib-2.12.2-monotonic-timer.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5211

Modified Files:
	glib-2.12.2-monotonic-timer.patch 
Log Message:
fix patch


glib-2.12.2-monotonic-timer.patch:
 configure.in  |    8 +++-
 glib/gtimer.c |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 103 insertions(+), 14 deletions(-)

Index: glib-2.12.2-monotonic-timer.patch
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib-2.12.2-monotonic-timer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glib-2.12.2-monotonic-timer.patch	28 Aug 2006 03:13:20 -0000	1.1
+++ glib-2.12.2-monotonic-timer.patch	28 Aug 2006 03:30:00 -0000	1.2
@@ -1,5 +1,5 @@
---- glib-2.12.2/configure.in.monotonic-timer	2006-08-27 23:09:08.000000000 -0400
-+++ glib-2.12.2/configure.in	2006-08-27 23:10:20.000000000 -0400
+--- glib-2.12.2/configure.in.monotonic-timer	2006-07-22 14:28:17.000000000 -0400
++++ glib-2.12.2/configure.in	2006-08-27 23:30:36.000000000 -0400
 @@ -856,6 +856,12 @@
  
  # Check for some functions
@@ -13,8 +13,17 @@
  
  AC_CHECK_HEADERS(crt_externs.h)
  AC_CHECK_FUNCS(_NSGetEnviron)
---- glib-2.12.2/glib/gtimer.c.monotonic-timer	2006-08-27 23:09:20.000000000 -0400
-+++ glib-2.12.2/glib/gtimer.c	2006-08-27 23:10:20.000000000 -0400
+@@ -1547,7 +1553,7 @@
+    void *ret;
+    pthread_create (&t, $1, func, 0);
+    pthread_join (t, &ret);
+-   exit (check_me != 42 || ret != &check_me);
++   return (check_me != 42 || ret != &check_me);
+ }])
+ 
+ dnl
+--- glib-2.12.2/glib/gtimer.c.monotonic-timer	2006-06-20 12:37:43.000000000 -0400
++++ glib-2.12.2/glib/gtimer.c	2006-08-27 23:29:53.000000000 -0400
 @@ -50,27 +50,56 @@
  #include "glib.h"
  #include "galias.h"