[Emacs-diffs] emacs/src ChangeLog alloc.c

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/01/30 23:43:21

Modified files:
        src            : ChangeLog alloc.c 

Log message:
        (mark_stack): Properly conditionalize previous change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7330&r2=1.7331
http://cvs.savannah.gnu.org/viewcvs/emacs/src/alloc.c?cvsroot=emacs&r1=1.446&r2=1.447

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7330
retrieving revision 1.7331
diff -u -b -r1.7330 -r1.7331
--- ChangeLog   30 Jan 2009 18:01:40 -0000      1.7330
+++ ChangeLog   30 Jan 2009 23:43:20 -0000      1.7331
@@ -1,3 +1,7 @@
+2009-01-30  Dan Nicolaescu  <address@hidden>
+
+       * alloc.c (mark_stack): Properly conditionalize previous change.
+
 2009-01-30  Juanma Barranquero  <address@hidden>
 
        * w32inevt.c (w32_console_read_socket) [SYNC_INPUT]:

Index: alloc.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/alloc.c,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -b -r1.446 -r1.447
--- alloc.c     23 Jan 2009 04:38:18 -0000      1.446
+++ alloc.c     30 Jan 2009 23:43:21 -0000      1.447
@@ -4488,7 +4488,8 @@
      needed on ia64 too.  See mach_dep.c, where it also says inline
      assembler doesn't work with relevant proprietary compilers.  */
 #ifdef __sparc__
-#ifdef __sparc64__
+#if defined (__sparc64__) && defined (__FreeBSD__)
+  /* FreeBSD does not have a ta 3 handler.  */
   asm ("flushw");
 #else
   asm ("ta 3");