diff options
| author | Eli Zaretskii | 2014-04-16 16:27:28 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-04-16 16:27:28 +0300 |
| commit | bf6b4923f7eedea193dee2130bf7fa597a5932d4 (patch) | |
| tree | 62bd144e45df20c0fc1600eedb3f744dcfe959a2 /src/msdos.h | |
| parent | 3a31cae4677c7c5e501dcf7e5c520e49db16f75e (diff) | |
| download | emacs-bf6b4923f7eedea193dee2130bf7fa597a5932d4.tar.gz emacs-bf6b4923f7eedea193dee2130bf7fa597a5932d4.zip | |
Fix the MSDOS build.
src/unexcoff.c [MSDOS]: Include libc/atexit.h.
(copy_text_and_data): Zero out the atexit chain pointer before
dumping Emacs.
src/termhooks.h (encode_terminal_code): Update prototype.
src/term.c (encode_terminal_code) [DOS_NT]: Make it externally
visible for all DOS_NT ports, not just WINDOWSNT.
(syms_of_term) [!MSDOS]: Don't define 'tty-menu-*' symbols on MSDOS.
src/sysdep.c (emacs_sigaction_init, init_signals): Don't use SIGCHLD
unless it is defined.
(emacs_pipe) [MSDOS]: Redirect to 'pipe'.
src/process.c (close_on_exec, accept4, process_socket): Move into
the "ifdef subprocesses" part.
(catch_child_signal): Condition by "ifdef subprocesses".
(syms_of_process) <Qinternal_default_process_sentinel>
<Qinternal_default_process_filter>: Condition by "ifdef subprocesses".
src/msdos.h: Add prototypes for new functions.
(EINPROGRESS): Define.
(O_CLOEXEC): Define to zero.
src/msdos.c (check_window_system): Remove unnecessary an
incompatible duplicate function.
(sys_opendir, readlinkat, faccessat, fstatat, unsetenv): New
functions in support of new functionality.
src/menu.c (single_menu_item): Add visual indication of submenu
also for menus on MSDOS frames.
(Fx_popup_menu) [!MSDOS]: Do not call tty_menu_show on MSDOS.
src/lisp.h (CHECK_PROCESS) [!subprocesses]: Do not define
when async subprocesses aren't supported.
src/font.h (FONT_WIDTH) [MSDOS]: MSDOS-specific definition.
src/emacs.c (close_output_streams): Zero out errno before calling
close_stream.
src/dired.c [MSDOS]: Include msdos.h.
src/conf_post.h (opendir) [MSDOS]: Redirect to sys_opendir.
(DATA_START) [MSDOS]: Define.
(SYSTEM_PURESIZE_EXTRA) [MSDOS]: Enlarge by 25K.
src/callproc.c (block_child_signal, unblock_child_signal) [MSDOS]:
Ifdef away for MSDOS.
(record_kill_process) [MSDOS]: Ifdef away the entire body for MSDOS.
(call_process_cleanup) [MSDOS]: Ifdef away portions not relevant
for MSDOS.
(call_process) [MSDOS]: Fix call sequence of dostounix_filename.
Use temporary file template that is compatible with mkostemp.
Move vfork-related portions under #ifndef MSDOS.
(syms_of_callproc): Unify templates of MSDOS and WINDOWSNT.
lisp/term/pc-win.el (x-list-fonts, x-get-selection-value): Provide
doc strings, as required by snarf-documentation.
msdos/sedlisp.inp:
msdos/sedlibmk.inp:
msdos/sedleim.inp:
msdos/sed3v2.inp:
msdos/sed2v2.inp:
msdos/sed1v2.inp: Update Sed scripts for Emacs 24.4.
msdos/inttypes.h: Add PRIdMAX.
msdos/INSTALL: Update for Emacs 24.4.
msdos/sedadmin.inp: New file.
Diffstat (limited to 'src/msdos.h')
| -rw-r--r-- | src/msdos.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/msdos.h b/src/msdos.h index 5d5f5df091f..e863c7cea4e 100644 --- a/src/msdos.h +++ b/src/msdos.h | |||
| @@ -41,9 +41,25 @@ void mouse_on (void); | |||
| 41 | void mouse_off (void); | 41 | void mouse_off (void); |
| 42 | void mouse_moveto (int, int); | 42 | void mouse_moveto (int, int); |
| 43 | 43 | ||
| 44 | #include <sys/types.h> | ||
| 45 | #include <sys/stat.h> | ||
| 46 | |||
| 44 | #if __DJGPP__ == 2 && __DJGPP_MINOR__ < 4 | 47 | #if __DJGPP__ == 2 && __DJGPP_MINOR__ < 4 |
| 45 | int readlink (const char *, char *, size_t); | 48 | int readlink (const char *, char *, size_t); |
| 46 | #endif | 49 | #endif |
| 50 | ssize_t readlinkat (int, const char *, char *, size_t); | ||
| 51 | int fstatat (int, char const *, struct stat *, int); | ||
| 52 | int unsetenv (const char *); | ||
| 53 | |||
| 54 | /* Constants. */ | ||
| 55 | #define EINPROGRESS 112 | ||
| 56 | /* Gnulib sets O_CLOEXEC to O_NOINHERIT, which gets in the way when we | ||
| 57 | need to redirect standard handles for subprocesses using temporary | ||
| 58 | files created by mkostemp, see callproc.c. */ | ||
| 59 | #ifdef O_CLOEXEC | ||
| 60 | # undef O_CLOEXEC | ||
| 61 | #endif | ||
| 62 | #define O_CLOEXEC 0 | ||
| 47 | 63 | ||
| 48 | 64 | ||
| 49 | #ifndef HAVE_X_WINDOWS | 65 | #ifndef HAVE_X_WINDOWS |
| @@ -83,7 +99,6 @@ extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); | |||
| 83 | #define XMenuSetAEQ (void) | 99 | #define XMenuSetAEQ (void) |
| 84 | #define XMenuSetFreeze (void) | 100 | #define XMenuSetFreeze (void) |
| 85 | #define XMenuRecompute (void) | 101 | #define XMenuRecompute (void) |
| 86 | #define FONT_WIDTH(foo) 1 | ||
| 87 | #define XM_FAILURE -1 | 102 | #define XM_FAILURE -1 |
| 88 | #define XM_SUCCESS 1 | 103 | #define XM_SUCCESS 1 |
| 89 | #define XM_NO_SELECT 2 | 104 | #define XM_NO_SELECT 2 |