[Emacs-diffs] trunk r113895: Revert last change to gmalloc.c; update some comments.

[Ken Brown]

------------------------------------------------------------
revno: 113895
revision-id: address@hidden
parent: address@hidden
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-15 12:37:15 -0400
message:
  Revert last change to gmalloc.c; update some comments.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/emacs.c                    emacs.c-20091113204419-o5vbwnq5f7feedwu-241
  src/gmalloc.c                  gmalloc.c-20091113204419-o5vbwnq5f7feedwu-1085

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-08-15 06:31:14 +0000
+++ b/ChangeLog 2013-08-15 16:37:15 +0000
@@ -1,3 +1,7 @@
+2013-08-15  Ken Brown  <address@hidden>
+
+       * configure.ac (G_SLICE_ALWAYS_MALLOC): Update comment.
+
 2013-08-15  Glenn Morris  <address@hidden>
 
        * make-dist: Do not distribute etc/refcards TeX intermediate files.

=== modified file 'configure.ac'
--- a/configure.ac      2013-08-14 02:15:01 +0000
+++ b/configure.ac      2013-08-15 16:37:15 +0000
@@ -4340,14 +4340,16 @@
 
 
 case $opsys in
-  dnl Emacs supplies its own malloc, but glib (part of Gtk+) calls
-  dnl memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
-  dnl As malloc is not the Cygwin malloc, the Cygwin memalign always
-  dnl returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
+  dnl Emacs supplies its own malloc, but glib calls posix_memalign,
+  dnl and on Cygwin prior to version 1.7.24 that becomes the
+  dnl Cygwin-supplied posix_memalign.  As malloc is not the Cygwin
+  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)
     AC_DEFINE(G_SLICE_ALWAYS_MALLOC, 1, [Define to set the
-      G_SLICE environment variable to "always-malloc" at startup, if
-      using GTK.])
+      G_SLICE environment variable to "always-malloc" at startup.])
     ;;
 
   hpux11)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-15 16:28:42 +0000
+++ b/src/ChangeLog     2013-08-15 16:37:15 +0000
@@ -1,3 +1,9 @@
+2013-08-15  Ken Brown  <address@hidden>
+
+       * 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  <address@hidden>
 
        Fix minor problems found by static checking.

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2013-08-11 19:43:36 +0000
+++ b/src/emacs.c       2013-08-15 16:37:15 +0000
@@ -696,7 +696,8 @@
 #endif
 
 #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");
 #endif
 

=== modified file 'src/gmalloc.c'
--- a/src/gmalloc.c     2013-08-14 19:09:51 +0000
+++ b/src/gmalloc.c     2013-08-15 16:37:15 +0000
@@ -1558,15 +1558,6 @@
 
 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 *
 memalign (size_t alignment, size_t size)
 {