diff options
| author | Stefan Monnier | 2010-10-15 17:55:33 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-10-15 17:55:33 -0400 |
| commit | 0c747cb143fa227e78f350ac353d703f489209df (patch) | |
| tree | 5b434055c797bd75eaa1e3d9d0773e586d44daee /src/filelock.c | |
| parent | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (diff) | |
| parent | aa095b2db98ae149737f8de00ee733b1d257ed33 (diff) | |
| download | emacs-0c747cb143fa227e78f350ac353d703f489209df.tar.gz emacs-0c747cb143fa227e78f350ac353d703f489209df.zip | |
Merge from trunk
Diffstat (limited to 'src/filelock.c')
| -rw-r--r-- | src/filelock.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/filelock.c b/src/filelock.c index 15ed546bc50..acca7234419 100644 --- a/src/filelock.c +++ b/src/filelock.c | |||
| @@ -31,10 +31,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | #include <sys/file.h> | 33 | #include <sys/file.h> |
| 34 | #ifdef HAVE_FCNTL_H | ||
| 35 | #include <fcntl.h> | 34 | #include <fcntl.h> |
| 36 | #endif | ||
| 37 | #include <string.h> | ||
| 38 | 35 | ||
| 39 | #ifdef HAVE_UNISTD_H | 36 | #ifdef HAVE_UNISTD_H |
| 40 | #include <unistd.h> | 37 | #include <unistd.h> |