* configure.ac (G_SLICE_ALWAYS_MALLOC): Remove obsolete macro.

* src/emacs.c (main): Remove use of obsolete macro
G_SLICE_ALWAYS_MALLOC.

4 files changed, 9 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 8011206ded2..de9f3a0bef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-25  Ken Brown  <kbrown@cornell.edu>
+
+        * configure.ac (G_SLICE_ALWAYS_MALLOC): Remove obsolete macro.
+
 2014-08-25  Christoph Scholtes  <cschol2112@gmail.com>
 
         * INSTALL.REPO: Remove reference to obsolete configure scripts
diff --git a/configure.ac b/configure.ac
index 30435d67508..4728ec51368 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4593,20 +4593,6 @@ if test $emacs_cv_usable_FIONREAD = yes; then
   fi
 fi
 
-
-case $opsys in
-  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.])
-    ;;
-
   hpux11)
     dnl It works to open the pty's tty in the parent (Emacs), then
     dnl close and reopen it in the child.
diff --git a/src/ChangeLog b/src/ChangeLog
index bb678dc4843..391d2e52100 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-25  Ken Brown  <kbrown@cornell.edu>
+
+        * emacs.c (main): Remove use of obsolete macro
+        G_SLICE_ALWAYS_MALLOC.
+
 2014-08-25  Eli Zaretskii  <eliz@gnu.org>
 
         Implement locale-sensitive string collation for MS-Windows.
diff --git a/src/emacs.c b/src/emacs.c
index a53b4cfd4ed..c381a771a68 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -734,12 +734,6 @@ main (int argc, char **argv)
   stack_base = &dummy;
 #endif
 
-#ifdef G_SLICE_ALWAYS_MALLOC
-  /* 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
-
 #ifndef CANNOT_DUMP
   might_dump = !initialized;
 #endif