PERFORCE change 152637 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=152637

Change 152637 by peter at peter_overcee on 2008/11/07 22:47:49

	Rearrange deck chairs to make gcc happier.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_libcsignal.c#10 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_libcsignal.c#10 (text+ko) ====

@@ -350,8 +350,8 @@
 #if defined(VGP_x86_freebsd)
   Int is32on64;
 #endif
+  Bool have_sigtimedwait_zero = True;
 #endif
-  Bool have_sigtimedwait_zero = True;
   static const struct vki_timespec zero = { 0, 0 };
 
 #if __FreeBSD__ < 7
@@ -364,14 +364,14 @@
   if (is32on64 && osreldate < 700000)
      have_sigtimedwait_zero = False;
 #endif
+  if (have_sigtimedwait_zero) {
 #endif
-  if (have_sigtimedwait_zero) {
      SysRes res = VG_(do_syscall3)(__NR_sigtimedwait, (UWord)set, (UWord)info, 
                                    (UWord)&zero);
      return res.isError ? -1 : res.res;
+#if __FreeBSD__ < 7
   }
 
-#if __FreeBSD__ < 7
   /* Find out what's pending: FreeBSD sigpending */
   sr = VG_(do_syscall1)(__NR_sigpending, (UWord)&pending);
   vg_assert(!sr.isError);