diff options
| author | Eli Zaretskii | 2010-04-01 17:59:46 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2010-04-01 17:59:46 +0300 |
| commit | ed68db4d2cf55caf6847151079e1b3861e5d0879 (patch) | |
| tree | a906021821c631f3d8ee4595c09e6d3afbe723df /src/sysdep.c | |
| parent | 814062c76646a9dd4504ae578d7fb41891a5cab4 (diff) | |
| download | emacs-ed68db4d2cf55caf6847151079e1b3861e5d0879.tar.gz emacs-ed68db4d2cf55caf6847151079e1b3861e5d0879.zip | |
Remove support for DJGPP v1.x (bug#5813).
src/:
w16select.c (__dpmi_int): Remove DJGPP v1.x compatibility.
s/msdos.h:
unexec.c (make_hdr, copy_text_and_data):
sysdep.c (wait_for_termination, sys_subshell):
msdos.c (dos_set_window_size, msdos_set_cursor_shape)
(IT_set_terminal_modes):
(__write, _rename, gethostname, gettimeofday, alarm, fork, kill)
(dos_ttraw, dos_ttcooked, run_msdos_command, abort): Remove DJGPP
v1.x code and tests of the value of __DJGPP__.
(nice, pause, sigsetmask, sigblock): Remove DJGPP v1.x
compatibility code.
lread.c:
gmalloc.c (memalign):
fileio.c (Fcopy_file, check_executable, Ffile_modes):
emacs.c (main):
dosfns.c (init_dosfns):
dired.c (file_name_completion_stat): Remove tests of __DJGPP__.
msdos/:
sed3.inp:
sed2.inp:
sed1.inp:
mainmake: Files removed.
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index e23f52d92e5..71b2a0f461b 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -90,11 +90,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 90 | #include "msdos.h" | 90 | #include "msdos.h" |
| 91 | #include <sys/param.h> | 91 | #include <sys/param.h> |
| 92 | 92 | ||
| 93 | #if __DJGPP__ > 1 | ||
| 94 | extern int etext; | 93 | extern int etext; |
| 95 | extern unsigned start __asm__ ("start"); | 94 | extern unsigned start __asm__ ("start"); |
| 96 | #endif | 95 | #endif |
| 97 | #endif | ||
| 98 | 96 | ||
| 99 | #ifndef USE_CRT_DLL | 97 | #ifndef USE_CRT_DLL |
| 100 | #ifndef errno | 98 | #ifndef errno |
| @@ -462,13 +460,7 @@ wait_for_termination (pid) | |||
| 462 | #endif /* not POSIX_SIGNALS */ | 460 | #endif /* not POSIX_SIGNALS */ |
| 463 | #endif /* not BSD_SYSTEM, and not HPUX version >= 6 */ | 461 | #endif /* not BSD_SYSTEM, and not HPUX version >= 6 */ |
| 464 | #else /* not subprocesses */ | 462 | #else /* not subprocesses */ |
| 465 | #if __DJGPP__ > 1 | ||
| 466 | break; | 463 | break; |
| 467 | #else /* not __DJGPP__ > 1 */ | ||
| 468 | if (kill (pid, 0) < 0) | ||
| 469 | break; | ||
| 470 | wait (0); | ||
| 471 | #endif /* not __DJGPP__ > 1*/ | ||
| 472 | #endif /* not subprocesses */ | 464 | #endif /* not subprocesses */ |
| 473 | } | 465 | } |
| 474 | } | 466 | } |
| @@ -672,10 +664,8 @@ sys_subshell () | |||
| 672 | 664 | ||
| 673 | #ifdef DOS_NT | 665 | #ifdef DOS_NT |
| 674 | pid = 0; | 666 | pid = 0; |
| 675 | #if __DJGPP__ > 1 | ||
| 676 | save_signal_handlers (saved_handlers); | 667 | save_signal_handlers (saved_handlers); |
| 677 | synch_process_alive = 1; | 668 | synch_process_alive = 1; |
| 678 | #endif /* __DJGPP__ > 1 */ | ||
| 679 | #else | 669 | #else |
| 680 | pid = vfork (); | 670 | pid = vfork (); |
| 681 | if (pid == -1) | 671 | if (pid == -1) |
| @@ -747,7 +737,7 @@ sys_subshell () | |||
| 747 | } | 737 | } |
| 748 | 738 | ||
| 749 | /* Do this now if we did not do it before. */ | 739 | /* Do this now if we did not do it before. */ |
| 750 | #if !defined (MSDOS) || __DJGPP__ == 1 | 740 | #ifndef MSDOS |
| 751 | save_signal_handlers (saved_handlers); | 741 | save_signal_handlers (saved_handlers); |
| 752 | synch_process_alive = 1; | 742 | synch_process_alive = 1; |
| 753 | #endif | 743 | #endif |