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/conf_post.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/conf_post.h')
| -rw-r--r-- | src/conf_post.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/conf_post.h b/src/conf_post.h index bb3be1bb1ea..8fabd60871b 100644 --- a/src/conf_post.h +++ b/src/conf_post.h | |||
| @@ -121,6 +121,11 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 121 | #else | 121 | #else |
| 122 | # define lstat stat | 122 | # define lstat stat |
| 123 | #endif | 123 | #endif |
| 124 | |||
| 125 | /* We must intercept 'opendir' calls to stash away the directory name, | ||
| 126 | so we could reuse it in realinkat, see msdos.c. */ | ||
| 127 | #define opendir sys_opendir | ||
| 128 | |||
| 124 | /* The "portable" definition of _GL_INLINE on config.h does not work | 129 | /* The "portable" definition of _GL_INLINE on config.h does not work |
| 125 | with DJGPP GCC 3.4.4: it causes unresolved externals in sysdep.c, | 130 | with DJGPP GCC 3.4.4: it causes unresolved externals in sysdep.c, |
| 126 | although lib/execinfo.h is included and the inline functions there | 131 | although lib/execinfo.h is included and the inline functions there |
| @@ -132,6 +137,9 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 132 | 137 | ||
| 133 | #define emacs_raise(sig) msdos_fatal_signal (sig) | 138 | #define emacs_raise(sig) msdos_fatal_signal (sig) |
| 134 | 139 | ||
| 140 | /* DATA_START is needed by vm-limit.c and unexcoff.c. */ | ||
| 141 | #define DATA_START (&etext + 1) | ||
| 142 | |||
| 135 | /* Define one of these for easier conditionals. */ | 143 | /* Define one of these for easier conditionals. */ |
| 136 | #ifdef HAVE_X_WINDOWS | 144 | #ifdef HAVE_X_WINDOWS |
| 137 | /* We need a little extra space, see ../../lisp/loadup.el and the | 145 | /* We need a little extra space, see ../../lisp/loadup.el and the |
| @@ -148,7 +156,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 148 | directory tree). Given the unknown policy of different DPMI | 156 | directory tree). Given the unknown policy of different DPMI |
| 149 | hosts regarding loading of untouched pages, I'm not going to risk | 157 | hosts regarding loading of untouched pages, I'm not going to risk |
| 150 | enlarging Emacs footprint by another 100+ KBytes. */ | 158 | enlarging Emacs footprint by another 100+ KBytes. */ |
| 151 | #define SYSTEM_PURESIZE_EXTRA (-170000+65000) | 159 | #define SYSTEM_PURESIZE_EXTRA (-170000+90000) |
| 152 | #endif | 160 | #endif |
| 153 | #endif /* MSDOS */ | 161 | #endif /* MSDOS */ |
| 154 | 162 | ||