comparison src/gmalloc.c @ 107733:84b961690802

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.
author Eli Zaretskii <eliz@gnu.org>
date Thu, 01 Apr 2010 17:59:46 +0300
parents 876b289a899e
children c15389f78514
comparison
equal deleted inserted replaced
107732:dc45468b3140 107733:84b961690802
120 extern __ptr_t calloc PP ((__malloc_size_t __nmemb, __malloc_size_t __size)); 120 extern __ptr_t calloc PP ((__malloc_size_t __nmemb, __malloc_size_t __size));
121 /* Free a block allocated by `malloc', `realloc' or `calloc'. */ 121 /* Free a block allocated by `malloc', `realloc' or `calloc'. */
122 extern void free PP ((__ptr_t __ptr)); 122 extern 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. */
126 extern __ptr_t memalign PP ((__malloc_size_t __alignment, 126 extern __ptr_t memalign PP ((__malloc_size_t __alignment,
127 __malloc_size_t __size)); 127 __malloc_size_t __size));
128 extern int posix_memalign PP ((__ptr_t *, __malloc_size_t, 128 extern int posix_memalign PP ((__ptr_t *, __malloc_size_t,
129 __malloc_size_t size)); 129 __malloc_size_t size));
130 #endif 130 #endif
1761 #ifndef _MALLOC_INTERNAL 1761 #ifndef _MALLOC_INTERNAL
1762 #define _MALLOC_INTERNAL 1762 #define _MALLOC_INTERNAL
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
1776 __ptr_t 1769 __ptr_t
1777 memalign (alignment, size) 1770 memalign (alignment, size)
1876 *memptr = mem; 1869 *memptr = mem;
1877 1870
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
1885 This library is free software; you can redistribute it and/or 1877 This library is free software; you can redistribute it and/or
1886 modify it under the terms of the GNU General Public License as 1878 modify it under the terms of the GNU General Public License as