aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-12-16 17:05:26 -0800
committerPaul Eggert2011-12-16 17:05:26 -0800
commit2adb6e857867449beb24faf7b361e7c3c3904c88 (patch)
treed5bcda5118eb3bba5e8812ec89a896f2858251d9 /src
parentadee8a65c46c101249a665ad34bad70fcd8b0deb (diff)
downloademacs-2adb6e857867449beb24faf7b361e7c3c3904c88.tar.gz
emacs-2adb6e857867449beb24faf7b361e7c3c3904c88.zip
* s/gnu-linux.h: Fix mark_memory typo (Bug#10286).
(GC_MARK_SECONDARY_STACK): Omit removed 3rd arg to mark_memory, which caused a build failure on GNU/Linux IA-64. This problem was introduced by my 2011-10-07 patch.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/s/gnu-linux.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f8fa66d0046..98e87ef4306 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12011-12-17 Paul Eggert <eggert@cs.ucla.edu>
2
3 * s/gnu-linux.h: Fix mark_memory typo (Bug#10286).
4 (GC_MARK_SECONDARY_STACK): Omit removed 3rd arg to mark_memory,
5 which caused a build failure on GNU/Linux IA-64. This problem was
6 introduced by my 2011-10-07 patch.
7
12011-12-15 Juri Linkov <juri@jurta.org> 82011-12-15 Juri Linkov <juri@jurta.org>
2 9
3 * image.c (imagemagick_error): New function. (Bug#10112) 10 * image.c (imagemagick_error): New function. (Bug#10112)
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 3d78bf695bc..d89b14cc080 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -155,7 +155,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
155 extern void *__libc_ia64_register_backing_store_base; \ 155 extern void *__libc_ia64_register_backing_store_base; \
156 __builtin_ia64_flushrs (); \ 156 __builtin_ia64_flushrs (); \
157 mark_memory (__libc_ia64_register_backing_store_base, \ 157 mark_memory (__libc_ia64_register_backing_store_base, \
158 __builtin_ia64_bsp (), 0); \ 158 __builtin_ia64_bsp ()); \
159 } while (0) 159 } while (0)
160#endif 160#endif
161#endif 161#endif