From 4ffea4478002db1df699a563477ec06000628e77 Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Tue, 20 Nov 2012 08:26:40 -0500 Subject: [PATCH] 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. --- src/ChangeLog | 6 ++++++ src/emacs.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index da5a9607903..3836e32fdbc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-11-20 Ken Brown + + * 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 * xdisp.c (start_hourglass) [HAVE_NTGUI]: Don't mix declaration of diff --git a/src/emacs.c b/src/emacs.c index 98e3f11f0cb..f533c3ae983 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -702,7 +702,7 @@ main (int argc, char **argv) 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 -- 2.39.2