* lisp/emacs-lisp/timer.el (with-timeout): Make sure we cancel the timer

[bpt/emacs.git] / lib-src / profile.c

diff --git a/lib-src/profile.c b/lib-src/profile.c
index 628b72d..086d8cc 100644 (file)
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,15 +1,14 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
-   Copyright (C) 1992, 1994, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994, 1999, 2001-2011  Free Software Foundation, Inc.
 
- Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
+Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /**
@@ -41,8 +38,8 @@ static char time_string[30];
 
 /* Reset the stopwatch to zero.  */
 
-void
-reset_watch ()
+static void
+reset_watch (void)
 {
   EMACS_GET_TIME (TV1);
   watch_not_started = 0;
@@ -52,8 +49,8 @@ reset_watch ()
    is returned as a string with the format  <seconds>.<micro-seconds>
    If reset_watch was not called yet, exit.  */
 
-char *
-get_time ()
+static char *
+get_time (void)
 {
   if (watch_not_started)
     exit (EXIT_FAILURE);  /* call reset_watch first ! */
@@ -81,7 +78,7 @@ gettimeofday (tp, tzp)
 #endif
 \f
 int
-main ()
+main (void)
 {
   int c;
   while ((c = getchar ()) != EOF)
@@ -104,7 +101,5 @@ main ()
   exit (EXIT_FAILURE);
 }
 
-/* arch-tag: 8db68f7e-2322-4944-a315-dba349bdbf39
-   (do not change this comment) */
 
 /* profile.c ends here */