diff options
| author | Eli Zaretskii | 2016-04-30 13:45:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2016-04-30 13:45:33 +0300 |
| commit | ccdaf04cfdaa42fb85d456274405cce32ee9f5d4 (patch) | |
| tree | 631c59e4dad1db81cca00edeaa721ae8c0e522e5 /src/filelock.c | |
| parent | ffe701cb07cfb3584c4e4894976f0c9487d02c59 (diff) | |
| download | emacs-ccdaf04cfdaa42fb85d456274405cce32ee9f5d4.tar.gz emacs-ccdaf04cfdaa42fb85d456274405cce32ee9f5d4.zip | |
Fix the MSDOS build
* config.bat:
* msdos/sedlisp.inp:
* msdos/sedlibmk.inp:
* msdos/sedleim.inp:
* msdos/sedadmin.inp:
* msdos/sed6.inp:
* msdos/sed3v2.inp:
* msdos/sed2v2.inp:
* msdos/sed1v2.inp: Adapt to Emacs 25.
* src/process.c (remove_slash_colon): Move out of "#ifdef
subprocesses" block, as it its called unconditionally. Move
ADD_SUBFEATURE calls into "#ifdef subprocesses" block, as they
reference variables only defined in that block.
* src/msdos.h: Provide prototypes for IT_set_frame_parameters,
faccessat, msdos_fatal_signal, syms_of_msdos, pthread_sigmask,
dos_keysns, dos_keyread, run_msdos_command, and
syms_of_win16select, to avoid compiler warnings.
* src/msdos.c (SYS_ENVIRON): Define to either '_environ' or
'environ', depending on the DJGPP version.
Remove declarations of externally-visible Lisp objects, like
Qbackground_color and Qreverse.
(run_msdos_command): First argument is not signed, not unsigned.
Use SYS_ENVIRON.
(sys_select): Use 'timespec_cmp' instead of 'timespec_sign', as
the latter doesn't work when 'time_t' is an unsigned data type.
This caused idle timers to behave incorrectly: they only fired
after a keyboard input event.
* src/frame.c (adjust_frame_size) [MSDOS]: Account for
FRAME_TOP_MARGIN that isn't counted in the frame's number of
lines, but dos_set_window_size needs it to be added.
* src/lread.c (INFINITY, NAN) [DJGPP < 2.05]: Provide definitions.
* src/fns.c (sort_vector_copy) [__GNUC__ < 4]: Provide a prototype
that works around compilation errors with older GCC versions.
* src/w16select.c: Don't declare QCLIPBOARD and QPRIMARY as Lisp
Objects.
* src/filelock.c [MSDOS]: Ifdef away most of the code. Provide
no-op implementations for 'lock_file' and 'unlock_file'.
(Ffile_locked_p) [MSDOS]: Always return nil. This avoids multiple
ifdefs in all users of filelock.c functionality.
* src/conf_post.h (EOVERFLOW, SIZE_MAX) [DJGPP < 2.04]: Define.
* src/emacs.c [MSDOS]: Include dosfns.h, to avoid compiler
warnings.
* src/dosfns.h: Provide prototypes for dos_cleanup,
syms_of_dosfns, and init_dosfns.
* src/deps.mk (atimer.o): Depend on msdos.h.
(emacs.o): Depend on dosfns.h.
* src/atimer.c [MSDOS]: Include msdos.h, to avoid compiler
warnings.
* lisp/window.el (window--adjust-process-windows): Skip the body
if 'process-list' is not available. This avoids failure to start
up on MS-DOS.
* lisp/vc/diff.el (diff-no-select): Test 'make-process', not
'start-process', as the latter is now available on all platforms.
* lisp/textmodes/ispell.el (ispell-async-processp): Replace
'start-process' with 'make-process' in a comment.
* lisp/term/internal.el (IT-unicode-translations): Modify and add
a few translations to display Info files with Unicode markup. Fix
an ancient off-by-one mismatch error with Unicode codepoints.
* lisp/progmodes/compile.el (compilation-start): Test
'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/man.el (Man-build-man-command, Man-getpage-in-background):
Test 'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/international/mule-cmds.el (set-coding-system-map): Test
'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/eshell/esh-cmd.el (eshell-do-pipelines-synchronously): Doc
fix.
(eshell-execute-pipeline): Test 'make-process', not
'start-process', as the latter is now available on all platforms.
Diffstat (limited to 'src/filelock.c')
| -rw-r--r-- | src/filelock.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/filelock.c b/src/filelock.c index bc3a6209a8d..8aaa656438d 100644 --- a/src/filelock.c +++ b/src/filelock.c | |||
| @@ -53,6 +53,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 53 | #include "w32.h" /* for dostounix_filename */ | 53 | #include "w32.h" /* for dostounix_filename */ |
| 54 | #endif | 54 | #endif |
| 55 | 55 | ||
| 56 | #ifndef MSDOS | ||
| 57 | |||
| 56 | #ifdef HAVE_UTMP_H | 58 | #ifdef HAVE_UTMP_H |
| 57 | #include <utmp.h> | 59 | #include <utmp.h> |
| 58 | #endif | 60 | #endif |
| @@ -742,6 +744,19 @@ unlock_file (Lisp_Object fn) | |||
| 742 | SAFE_FREE (); | 744 | SAFE_FREE (); |
| 743 | } | 745 | } |
| 744 | 746 | ||
| 747 | #else /* MSDOS */ | ||
| 748 | void | ||
| 749 | lock_file (Lisp_Object fn) | ||
| 750 | { | ||
| 751 | } | ||
| 752 | |||
| 753 | void | ||
| 754 | unlock_file (Lisp_Object fn) | ||
| 755 | { | ||
| 756 | } | ||
| 757 | |||
| 758 | #endif /* MSDOS */ | ||
| 759 | |||
| 745 | void | 760 | void |
| 746 | unlock_all_files (void) | 761 | unlock_all_files (void) |
| 747 | { | 762 | { |
| @@ -805,6 +820,9 @@ The value is nil if the FILENAME is not locked, | |||
| 805 | t if it is locked by you, else a string saying which user has locked it. */) | 820 | t if it is locked by you, else a string saying which user has locked it. */) |
| 806 | (Lisp_Object filename) | 821 | (Lisp_Object filename) |
| 807 | { | 822 | { |
| 823 | #ifdef MSDOS | ||
| 824 | return Qnil; | ||
| 825 | #else | ||
| 808 | Lisp_Object ret; | 826 | Lisp_Object ret; |
| 809 | char *lfname; | 827 | char *lfname; |
| 810 | int owner; | 828 | int owner; |
| @@ -825,6 +843,7 @@ t if it is locked by you, else a string saying which user has locked it. */) | |||
| 825 | 843 | ||
| 826 | SAFE_FREE (); | 844 | SAFE_FREE (); |
| 827 | return ret; | 845 | return ret; |
| 846 | #endif | ||
| 828 | } | 847 | } |
| 829 | 848 | ||
| 830 | void | 849 | void |