Merge from emacs-24; up to 2012-04-26T03:04:36Z!cyd@gnu.org

[bpt/emacs.git] / src / s / sol2-6.h

diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index 3d9bd6d..bb7a985 100644 (file)
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Solaris 2.6.
 
-Copyright (C) 1999-2011  Free Software Foundation, Inc.
+Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -59,4 +59,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   }
 
 #define GC_SETJMP_WORKS 1
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS