gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / lib / save-cwd.h

diff --git a/lib/save-cwd.h b/lib/save-cwd.h
index 8f9d07d..614b035 100644 (file)
--- a/lib/save-cwd.h
+++ b/lib/save-cwd.h
@@ -1,5 +1,25 @@
+/* Save and restore current working directory.
+
+   Copyright (C) 1995, 1997-1998, 2003, 2009-2013 Free Software Foundation,
+   Inc.
+
+   This program 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 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   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 this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Jim Meyering.  */
+
 #ifndef SAVE_CWD_H
-#define SAVE_CWD_H 1
+# define SAVE_CWD_H 1
 
 struct saved_cwd
   {
@@ -7,17 +27,8 @@ struct saved_cwd
     char *name;
   };
 
-#ifndef __P
-#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#define __P(args) args
-#else
-#define __P(args) ()
-#endif  /* GCC.  */
-#endif  /* Not __P.  */
-
-int save_cwd __P((struct saved_cwd *cwd));
-int restore_cwd __P((const struct saved_cwd *cwd, const char *dest,
-                    const char *from));
-void free_cwd __P((struct saved_cwd *cwd));
+int save_cwd (struct saved_cwd *cwd);
+int restore_cwd (const struct saved_cwd *cwd);
+void free_cwd (struct saved_cwd *cwd);
 
 #endif /* SAVE_CWD_H */