Import Upstream version 5e4upstream/5e4

1 files changed, 20 insertions, 2 deletions

diff --git a/scmfig.h b/scmfig.h
index 6013800..969f3ca 100644
--- a/scmfig.h
+++ b/scmfig.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1990-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1990-2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -417,6 +417,16 @@ rgx.c	init_rgx();	regcomp and regexec. */
 # define WHITE_SPACES  ' ':case '\t':case '\r':case '\f'
 #endif
 
+#ifdef __ia64__
+# define PTR2INT(x) ((long)(x))
+#else
+# ifdef __x86_64
+#  define PTR2INT(x) ((long)(x))
+# else
+#  define PTR2INT(x) ((int)(x))
+# endif
+#endif
+
 /* Define BIGDIG to an integer type whose size is smaller than long if
    you want bignums.  BIGRAD is one greater than the biggest BIGDIG. */
 /* Define DIGSTOOBIG if the digits equivalent to a long won't fit in a long. */
@@ -765,6 +775,14 @@ typedef SCM  *SCMPTR;
 # include <unistd.h>
 #endif
 
+#ifdef __FreeBSD__
+# include <unistd.h>
+#endif
+
+#ifdef linux
+# include <unistd.h>
+#endif
+
 /* On VMS, GNU C's errno.h contains a special hack to get link attributes
    for errno correct for linking with libc. */
 
@@ -795,7 +813,7 @@ typedef SCM  *SCMPTR;
 
 #ifdef _WIN32
 // Windows doesn't set errno = EINTR
-# define SYSCALL(line) do{ line; while(GetLastError() == ERROR_OPERATION_ABORTED){SetLastError(0);Sleep(10);line};}while(0)
+# define SYSCALL(line) do{line;while(GetLastError() == ERROR_OPERATION_ABORTED){SetLastError(0);Sleep(10);line};}while(0)
 #else
 # define SYSCALL(line) do{errno = 0;line}while(SCM_INTERRUPTED(errno))
 #endif