HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove P_ and __P macros.
[bpt/emacs.git]
/
src
/
filelock.c
diff --git
a/src/filelock.c
b/src/filelock.c
index
ace84bf
..
b11338c
100644
(file)
--- a/
src/filelock.c
+++ b/
src/filelock.c
@@
-1,6
+1,6
@@
/* Lock files for editing.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 1998, 1999, 2000, 2001,
/* Lock files for editing.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008
, 2009, 2010
Free Software Foundation, Inc.
This file is part of GNU Emacs.
Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@
-24,6
+24,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <sys/stat.h>
#include <signal.h>
#include <stdio.h>
#include <sys/stat.h>
#include <signal.h>
#include <stdio.h>
+#include <setjmp.h>
#ifdef HAVE_PWD_H
#include <pwd.h>
#ifdef HAVE_PWD_H
#include <pwd.h>
@@
-46,9
+47,6
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif /* __FreeBSD__ */
#include <errno.h>
#endif /* __FreeBSD__ */
#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
#include "lisp.h"
#include "buffer.h"
#include "lisp.h"
#include "buffer.h"
@@
-62,7
+60,9
@@
Lisp_Object Vtemporary_file_directory;
#ifdef CLASH_DETECTION
#ifdef CLASH_DETECTION
+#ifdef HAVE_UTMP_H
#include <utmp.h>
#include <utmp.h>
+#endif
#if !defined (S_ISLNK) && defined (S_IFLNK)
#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
#if !defined (S_ISLNK) && defined (S_IFLNK)
#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)