diff options
| author | Joakim Verona | 2013-08-16 12:32:03 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-16 12:32:03 +0200 |
| commit | 4b1afd6ad231b5ba95436632d94f0bc81eacab27 (patch) | |
| tree | 2dbf1f46a9f4a24726d50fbe1d1cd5ebdc874e8a | |
| parent | 4f89fdfb1a480d29b60956f93dfadb3c0fcbff46 (diff) | |
| parent | 32c8eae2ad8afa6c5c8d067faa142b7e6bea9cf6 (diff) | |
| download | emacs-4b1afd6ad231b5ba95436632d94f0bc81eacab27.tar.gz emacs-4b1afd6ad231b5ba95436632d94f0bc81eacab27.zip | |
merge from trunk
| -rw-r--r-- | autogen/config.in | 2 | ||||
| -rwxr-xr-x | autogen/configure | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/autogen/config.in b/autogen/config.in index 00b7c5ba05e..a8ca66e22c8 100644 --- a/autogen/config.in +++ b/autogen/config.in | |||
| @@ -210,7 +210,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 210 | #undef GNU_MALLOC | 210 | #undef GNU_MALLOC |
| 211 | 211 | ||
| 212 | /* Define to set the G_SLICE environment variable to "always-malloc" at | 212 | /* Define to set the G_SLICE environment variable to "always-malloc" at |
| 213 | startup, if using GTK. */ | 213 | startup. */ |
| 214 | #undef G_SLICE_ALWAYS_MALLOC | 214 | #undef G_SLICE_ALWAYS_MALLOC |
| 215 | 215 | ||
| 216 | /* Define to 1 if you have the `accept4' function. */ | 216 | /* Define to 1 if you have the `accept4' function. */ |
diff --git a/autogen/configure b/autogen/configure index cde9f41c440..8a0144e20ea 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -17066,7 +17066,7 @@ fi | |||
| 17066 | 17066 | ||
| 17067 | 17067 | ||
| 17068 | case $opsys in | 17068 | case $opsys in |
| 17069 | cygwin) | 17069 | cygwin) |
| 17070 | 17070 | ||
| 17071 | $as_echo "#define G_SLICE_ALWAYS_MALLOC 1" >>confdefs.h | 17071 | $as_echo "#define G_SLICE_ALWAYS_MALLOC 1" >>confdefs.h |
| 17072 | 17072 | ||