diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-04-01 17:59:46 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-04-01 17:59:46 +0300 |
| commit | ed68db4d2cf55caf6847151079e1b3861e5d0879 (patch) | |
| tree | a906021821c631f3d8ee4595c09e6d3afbe723df /src/gmalloc.c | |
| parent | 814062c76646a9dd4504ae578d7fb41891a5cab4 (diff) | |
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/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index f1be37ba34..6445c56e6d 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -122,7 +122,7 @@ extern __ptr_t calloc PP ((__malloc_size_t __nmemb, __malloc_size_t __size)); extern void free PP ((__ptr_t __ptr)); /* Allocate SIZE bytes allocated to ALIGNMENT bytes. */ -#if ! (defined (_MALLOC_INTERNAL) && __DJGPP__ - 0 == 1) /* Avoid conflict. */ +#if !defined (_MALLOC_INTERNAL) || defined (MSDOS) /* Avoid conflict. */ extern __ptr_t memalign PP ((__malloc_size_t __alignment, __malloc_size_t __size)); extern int posix_memalign PP ((__ptr_t *, __malloc_size_t, @@ -1763,13 +1763,6 @@ Fifth Floor, Boston, MA 02110-1301, USA. */ #include <malloc.h> #endif -#if __DJGPP__ - 0 == 1 - -/* There is some problem with memalign in DJGPP v1 and we are supposed - to omit it. Noone told me why, they just told me to do it. */ - -#else - __ptr_t (*__memalign_hook) PP ((__malloc_size_t __size, __malloc_size_t __alignment)); @@ -1878,7 +1871,6 @@ posix_memalign (memptr, alignment, size) return 0; } -#endif /* Not DJGPP v1 */ /* Allocate memory on a page boundary. Copyright (C) 1991, 92, 93, 94, 96 Free Software Foundation, Inc. |