Merge from emacs-24 branch

[gnu-emacs] / src / s / unixware.h

diff --git a/src/s/unixware.h b/src/s/unixware.h
index 407282ff78c3b761bd98e0f21caae081d3255b18..63c36ee40c21bd0727c466cfffe8431785814b74 100644 (file)
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -1,6 +1,6 @@
 /* s/ file for Unixware.
 
-Copyright (C) 1999-2011  Free Software Foundation, Inc.
+Copyright (C) 1999-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -35,7 +35,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    within, it should be caught after sigrelse(2).  */
 #define PTY_TTY_NAME_SPRINTF                   \
   {                                            \
-    char *ptsname(), *ptyname;                 \
+    char *ptsname (int), *ptyname;             \
                                                \
     sigblock(sigmask(SIGCLD));                 \
     if (grantpt(fd) == -1)                     \
@@ -50,3 +50,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   }
 
 #define        PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
+
+/* Conservative garbage collection has not been tested, so for now
+   play it safe and stick with the old-fashioned way of marking.  */
+#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE