Merge changes from emacs-24 branch

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

diff --git a/src/s/unixware.h b/src/s/unixware.h
index c6130669a9a2f6bc31bc1e7aa42ec0792c902000..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)                     \
@@ -49,14 +49,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     pty_name[sizeof(pty_name) - 1] = 0;                \
   }
 
-/* Data type of load average, as read out of kmem.  */
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-/* This is totally uncalibrated. */
-#define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE))
-#define FSCALE 256.0
-
-
 #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