aboutsummaryrefslogtreecommitdiffstats
path: root/src/filelock.c
diff options
context:
space:
mode:
authorEli Zaretskii2010-10-29 12:43:38 +0200
committerEli Zaretskii2010-10-29 12:43:38 +0200
commitffe75e6b11498ef4e105aed8f650db343194c9e2 (patch)
treea2b6ca8b038076fc12f6bb5f0339a39e529dd9a5 /src/filelock.c
parent95de0327d08519791252386914c514db860d7588 (diff)
downloademacs-ffe75e6b11498ef4e105aed8f650db343194c9e2.tar.gz
emacs-ffe75e6b11498ef4e105aed8f650db343194c9e2.zip
Fix 2010-10-29T06:51:36Z!rgm@gnu.org for non-CLASH_DETECTION platforms.
emacs.c (main): Call syms_of_filelock unconditionally. filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION clause, but keep part of it conditioned on CLASH_DETECTION.
Diffstat (limited to 'src/filelock.c')
-rw-r--r--src/filelock.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/filelock.c b/src/filelock.c
index acca7234419..ae0584c447a 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -730,6 +730,8 @@ init_filelock (void)
730 boot_time_initialized = 0; 730 boot_time_initialized = 0;
731} 731}
732 732
733#endif /* CLASH_DETECTION */
734
733void 735void
734syms_of_filelock (void) 736syms_of_filelock (void)
735{ 737{
@@ -737,12 +739,12 @@ syms_of_filelock (void)
737 doc: /* The directory for writing temporary files. */); 739 doc: /* The directory for writing temporary files. */);
738 Vtemporary_file_directory = Qnil; 740 Vtemporary_file_directory = Qnil;
739 741
742#ifdef CLASH_DETECTION
740 defsubr (&Sunlock_buffer); 743 defsubr (&Sunlock_buffer);
741 defsubr (&Slock_buffer); 744 defsubr (&Slock_buffer);
742 defsubr (&Sfile_locked_p); 745 defsubr (&Sfile_locked_p);
746#endif
743} 747}
744 748
745#endif /* CLASH_DETECTION */
746
747/* arch-tag: e062676d-50b2-4be0-ab96-197c81b181a1 749/* arch-tag: e062676d-50b2-4be0-ab96-197c81b181a1
748 (do not change this comment) */ 750 (do not change this comment) */