From: Roland McGrath <roland@gnu.org>
Date: Sun, 16 Oct 2005 10:32:31 +0000 (+0000)
Subject: [BZ #1249, BZ #1252]
X-Git-Tag: upstream/2.20~9293
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c45c24812b64c41a494e74c789a9e91ea21b3f7c;p=platform%2Fupstream%2Flinaro-glibc.git

[BZ #1249, BZ #1252]

2005-08-05  Alfred M. Szmidt  <ams@gnu.org>
	[BZ #1252]
	* sysdeps/mach/hurd/setitimer.c (restart_itimer): Move static fn
	forward decl out of function body.
	* sysdeps/mach/hurd/profil.c: Likewise.

	[BZ #1249]
---

diff --git a/ChangeLog b/ChangeLog
index 1f7585c..46c4621 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-05  Alfred M. Szmidt  <ams@gnu.org>
+
+	[BZ #1252]
+	* sysdeps/mach/hurd/setitimer.c (restart_itimer): Move static fn
+	forward decl out of function body.
+	* sysdeps/mach/hurd/profil.c: Likewise.
+
 2005-10-16  Roland McGrath  <roland@frob.com>
 
 	[BZ #1254]
@@ -15,6 +22,7 @@
 	Use __builtin_frame_address and __builtin_return_address.
 	(_dl_init_first): Likewise.
 
+	[BZ #1249]
 	* sysdeps/mach/hurd/i386/init-first.c (_cthread_init_routine): Declare
 	as weak extern.
 	(init): Check for it being undefined.
diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c
index d212872..0426f67 100644
--- a/sysdeps/mach/hurd/profil.c
+++ b/sysdeps/mach/hurd/profil.c
@@ -1,5 +1,5 @@
 /* Low-level statistical profiling support function.  Mach/Hurd version.
-   Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 2000, 2002, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -49,6 +49,7 @@ static kern_return_t profil_task_get_sampled_pcs (mach_port_t,
 						  sampled_pc_array_t,
 						  mach_msg_type_number_t *);
 static void fetch_samples (void);
+static void profile_waiter (void);
 
 /* Enable statistical profiling, writing samples of the PC into at most
    SIZE bytes of SAMPLE_BUFFER; every processor clock tick while profiling
@@ -64,7 +65,6 @@ update_waiter (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
   if (profile_thread == MACH_PORT_NULL)
     {
       /* Set up the profiling collector thread.  */
-      static void profile_waiter (void);
       err = __thread_create (__mach_task_self (), &profile_thread);
       if (! err)
 	err = __mach_setup_thread (__mach_task_self (), profile_thread,
diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c
index 9fef562..fec64a8 100644
--- a/sysdeps/mach/hurd/setitimer.c
+++ b/sysdeps/mach/hurd/setitimer.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1994,1995,1996,1997,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1994,1995,1996,1997,2000,2001,2005
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -41,7 +42,7 @@ static void
 quantize_timeval (struct timeval *tv)
 {
   static time_t quantum = -1;
-  
+
   if (quantum == -1)
     quantum = 1000000 / __getclktck ();
 
@@ -127,14 +128,15 @@ timer_thread (void)
 }
 
 
+/* Forward declaration.  */
+static int setitimer_locked (const struct itimerval *new,
+			     struct itimerval *old, void *crit);
+
 static sighandler_t
 restart_itimer (struct hurd_signal_preemptor *preemptor,
 		struct hurd_sigstate *ss,
 		int *signo, struct hurd_signal_detail *detail)
 {
-  static int setitimer_locked (const struct itimerval *new,
-			       struct itimerval *old, void *crit);
-
   /* This function gets called in the signal thread
      each time a SIGALRM is arriving (even if blocked).  */
   struct itimerval it;