Merge from emacs--devo--0

[gnu-emacs] / src / prefix-args.c

diff --git a/src/prefix-args.c b/src/prefix-args.c
index 1f2632c6913fd4c97eb2eda08d43935d54db8eae..16d7b7dba17f54b5ca27b775e18c94875e472a03 100644 (file)
--- a/src/prefix-args.c
+++ b/src/prefix-args.c
@@ -1,12 +1,12 @@
 /* prefix-args.c - echo each argument, prefixed by a string.
 /* prefix-args.c - echo each argument, prefixed by a string.

-   Copyright (C) 1992, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 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
 
 This file is part of GNU Emacs.
 
 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 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -44,6 +44,14 @@ Boston, MA 02110-1301, USA.  */
    If I can't write a completely portable program to do this in C,
    I'm quitting and taking up gardening.  */
 
    If I can't write a completely portable program to do this in C,
    I'm quitting and taking up gardening.  */
 

+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if STDC_HEADERS
+# include <stdlib.h>           /* for proper declaration of `exit' */
+#endif
+

 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>