aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Brown2014-08-25 16:49:52 -0400
committerKen Brown2014-08-25 16:49:52 -0400
commit79404e16fb3d55a8d1b924766a781695e1bbf15a (patch)
tree18894c1e5bf9d6c15c2c560a98b7a5254f30f063 /src
parentf330aa150e8647594f31bef80bd49a7383efaf32 (diff)
downloademacs-79404e16fb3d55a8d1b924766a781695e1bbf15a.tar.gz
emacs-79404e16fb3d55a8d1b924766a781695e1bbf15a.zip
* configure.ac (G_SLICE_ALWAYS_MALLOC): Remove obsolete macro.
* src/emacs.c (main): Remove use of obsolete macro G_SLICE_ALWAYS_MALLOC.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/emacs.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bb678dc4843..391d2e52100 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-08-25 Ken Brown <kbrown@cornell.edu>
2
3 * emacs.c (main): Remove use of obsolete macro
4 G_SLICE_ALWAYS_MALLOC.
5
12014-08-25 Eli Zaretskii <eliz@gnu.org> 62014-08-25 Eli Zaretskii <eliz@gnu.org>
2 7
3 Implement locale-sensitive string collation for MS-Windows. 8 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)
734 stack_base = &dummy; 734 stack_base = &dummy;
735#endif 735#endif
736 736
737#ifdef G_SLICE_ALWAYS_MALLOC
738 /* This is used by the Cygwin build. It's not needed starting with
739 cygwin-1.7.24, but it doesn't do any harm. */
740 xputenv ("G_SLICE=always-malloc");
741#endif
742
743#ifndef CANNOT_DUMP 737#ifndef CANNOT_DUMP
744 might_dump = !initialized; 738 might_dump = !initialized;
745#endif 739#endif