aboutsummaryrefslogtreecommitdiffstats
path: root/src/gmalloc.c
diff options
context:
space:
mode:
authorEli Zaretskii2010-04-01 17:59:46 +0300
committerEli Zaretskii2010-04-01 17:59:46 +0300
commited68db4d2cf55caf6847151079e1b3861e5d0879 (patch)
treea906021821c631f3d8ee4595c09e6d3afbe723df /src/gmalloc.c
parent814062c76646a9dd4504ae578d7fb41891a5cab4 (diff)
downloademacs-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/gmalloc.c')
-rw-r--r--src/gmalloc.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c
index f1be37ba348..6445c56e6d4 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));
122extern void free PP ((__ptr_t __ptr)); 122extern void free PP ((__ptr_t __ptr));
123 123
124/* Allocate SIZE bytes allocated to ALIGNMENT bytes. */ 124/* Allocate SIZE bytes allocated to ALIGNMENT bytes. */
125#if ! (defined (_MALLOC_INTERNAL) && __DJGPP__ - 0 == 1) /* Avoid conflict. */ 125#if !defined (_MALLOC_INTERNAL) || defined (MSDOS) /* Avoid conflict. */
126extern __ptr_t memalign PP ((__malloc_size_t __alignment, 126extern __ptr_t memalign PP ((__malloc_size_t __alignment,
127 __malloc_size_t __size)); 127 __malloc_size_t __size));
128extern int posix_memalign PP ((__ptr_t *, __malloc_size_t, 128extern int posix_memalign PP ((__ptr_t *, __malloc_size_t,
@@ -1763,13 +1763,6 @@ Fifth Floor, Boston, MA 02110-1301, USA. */
1763#include <malloc.h> 1763#include <malloc.h>
1764#endif 1764#endif
1765 1765
1766#if __DJGPP__ - 0 == 1
1767
1768/* There is some problem with memalign in DJGPP v1 and we are supposed
1769 to omit it. Noone told me why, they just told me to do it. */
1770
1771#else
1772
1773__ptr_t (*__memalign_hook) PP ((__malloc_size_t __size, 1766__ptr_t (*__memalign_hook) PP ((__malloc_size_t __size,
1774 __malloc_size_t __alignment)); 1767 __malloc_size_t __alignment));
1775 1768
@@ -1878,7 +1871,6 @@ posix_memalign (memptr, alignment, size)
1878 return 0; 1871 return 0;
1879} 1872}
1880 1873
1881#endif /* Not DJGPP v1 */
1882/* Allocate memory on a page boundary. 1874/* Allocate memory on a page boundary.
1883 Copyright (C) 1991, 92, 93, 94, 96 Free Software Foundation, Inc. 1875 Copyright (C) 1991, 92, 93, 94, 96 Free Software Foundation, Inc.
1884 1876