masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert last change to gmalloc.c; update some comments.

Browse source
This commit is contained in:
Ken Brown 2013-08-15 12:37:15 -04:00
parent 691a357f3a
commit 0fe73012cd
5 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-08-15 Ken Brown <kbrown@cornell.edu>
* configure.ac (G_SLICE_ALWAYS_MALLOC): Update comment.
2013-08-15 Glenn Morris <rgm@gnu.org> 2013-08-15 Glenn Morris <rgm@gnu.org>
* make-dist: Do not distribute etc/refcards TeX intermediate files. * make-dist: Do not distribute etc/refcards TeX intermediate files.

14
configure.ac
View file

@ -4340,14 +4340,16 @@ fi
case $opsys in case $opsys in
dnl Emacs supplies its own malloc, but glib (part of Gtk+) calls dnl Emacs supplies its own malloc, but glib calls posix_memalign,
dnl memalign and on Cygwin, that becomes the Cygwin-supplied memalign. dnl and on Cygwin prior to version 1.7.24 that becomes the
dnl As malloc is not the Cygwin malloc, the Cygwin memalign always dnl Cygwin-supplied posix_memalign. As malloc is not the Cygwin
dnl returns ENOSYS. A workaround is to set G_SLICE=always-malloc. */ dnl malloc, the Cygwin posix_memalign always returns ENOSYS. A
dnl workaround is to set G_SLICE=always-malloc. This is no longer
dnl needed starting with cygwin-1.7.24, and it is no longer
dnl effective starting with glib-2.36. */
cygwin) cygwin)
AC_DEFINE(G_SLICE_ALWAYS_MALLOC, 1, [Define to set the AC_DEFINE(G_SLICE_ALWAYS_MALLOC, 1, [Define to set the
G_SLICE environment variable to "always-malloc" at startup, if G_SLICE environment variable to "always-malloc" at startup.])
using GTK.])
;; ;;
hpux11) hpux11)

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2013-08-15 Ken Brown <kbrown@cornell.edu>
* emacs.c (main): Update comment about G_SLICE_ALWAYS_MALLOC.
* gmalloc.c (memalign) [CYGWIN]: Revert last change; it's not
needed.
2013-08-15 Paul Eggert <eggert@cs.ucla.edu> 2013-08-15 Paul Eggert <eggert@cs.ucla.edu>
Fix minor problems found by static checking. Fix minor problems found by static checking.

3
src/emacs.c
View file

@ -696,7 +696,8 @@ main (int argc, char **argv)
#endif #endif
#ifdef G_SLICE_ALWAYS_MALLOC #ifdef G_SLICE_ALWAYS_MALLOC
/* This is used by the Cygwin build. */ /* This is used by the Cygwin build. It's not needed starting with
cygwin-1.7.24, but it doesn't do any harm. */
xputenv ("G_SLICE=always-malloc"); xputenv ("G_SLICE=always-malloc");
#endif #endif

9
src/gmalloc.c
View file

@ -1558,15 +1558,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. *
void *(*__memalign_hook) (size_t size, size_t alignment); void *(*__memalign_hook) (size_t size, size_t alignment);
/* As of version 1.7.24, Cygwin allows applications to provide their
own posix_memalign (but not memalign). But posix_memalign as
defined in this file calls memalign, so we have to rename the
latter in order to make sure that posix_memalign calls Emacs's
memalign. */
#ifdef CYGWIN
#define memalign emacs_memalign
#endif
void * void *
memalign (size_t alignment, size_t size) memalign (size_t alignment, size_t size)
{ {