diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacs.c | 6 |
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 @@ | |||
| 1 | 2014-08-25 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * emacs.c (main): Remove use of obsolete macro | ||
| 4 | G_SLICE_ALWAYS_MALLOC. | ||
| 5 | |||
| 1 | 2014-08-25 Eli Zaretskii <eliz@gnu.org> | 6 | 2014-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 |