[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110924: Fix non-GTK builds on Cygwin

[Ken Brown]

------------------------------------------------------------
revno: 110924
committer: Ken Brown <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-11-20 08:26:40 -0500
message:
  Fix non-GTK builds on Cygwin
  
  * src/emacs.c (main): Set the G_SLICE environment variable for all
    Cygwin builds, not just GTK builds.  See
    https://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00368.html.
modified:
  src/ChangeLog
  src/emacs.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-19 17:34:21 +0000
+++ b/src/ChangeLog     2012-11-20 13:26:40 +0000
@@ -1,3 +1,9 @@
+2012-11-20  Ken Brown  <address@hidden>
+
+       * emacs.c (main): Set the G_SLICE environment variable for all
+       Cygwin builds, not just GTK builds.  See
+       https://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00368.html.
+
 2012-11-19  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (start_hourglass) [HAVE_NTGUI]: Don't mix declaration of

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2012-10-31 17:27:29 +0000
+++ b/src/emacs.c       2012-11-20 13:26:40 +0000
@@ -702,7 +702,7 @@
   stack_base = &dummy;
 #endif
 
-#if defined (USE_GTK) && defined (G_SLICE_ALWAYS_MALLOC)
+#ifdef G_SLICE_ALWAYS_MALLOC
   /* This is used by the Cygwin build.  */
   setenv ("G_SLICE", "always-malloc", 1);
 #endif