1.0.11.17: fixed dumb buglet in DEFMACRO NAMED-LET

[sbcl.git] / src / runtime / wrap.c

diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c
index 29a79e1..376beaf 100644 (file)
--- a/src/runtime/wrap.c
+++ b/src/runtime/wrap.c
@@ -1,6 +1,6 @@
 /*
  * wrappers around low-level operations to provide a simpler interface
- * to the operations that Lisp needs
+ * to the operations that Lisp (and some contributed modules) needs.
  *
  * The functions in this file are typically called directly from Lisp.
  * Thus, when their signature changes, they don't need updates in a .h
@@ -34,6 +34,8 @@
 #include <unistd.h>
 #ifndef LISP_FEATURE_WIN32
 #include <pwd.h>
+#include <sys/wait.h>
+#include <netdb.h>
 #endif
 #include <stdio.h>
 
@@ -165,14 +167,26 @@ wrapped_readlink(char *path)
  *
  * Some motivated spark fixed MIPS. -- ths, 2005-10-06 */
 
-#ifdef LISP_FEATURE_MIPS
+#if defined(LISP_FEATURE_LARGEFILE) && !defined(LISP_FEATURE_MIPS)
+typedef dev_t ffi_dev_t;
+typedef off_t ffi_off_t;
+#elif defined(LISP_FEATURE_MIPS)
 typedef unsigned long ffi_dev_t; /* Linux/MIPS struct stat doesn't use dev_t */
 typedef off_t ffi_off_t;
+#elif defined(LISP_FEATURE_DARWIN)
+typedef dev_t ffi_dev_t;
+typedef off_t ffi_off_t;
 #else
 typedef u32 ffi_dev_t; /* since Linux dev_t can be 64 bits */
 typedef u32 ffi_off_t; /* since OpenBSD 2.8 st_size is 64 bits */
 #endif
 
+#ifdef LISP_FEATURE_OS_PROVIDES_BLKSIZE_T
+typedef blksize_t ffi_blksize_t;
+#else
+typedef unsigned long ffi_blksize_t;
+#endif
+
 /* a representation of stat(2) results which doesn't depend on CPU or OS */
 struct stat_wrapper {
     /* KLUDGE: The verbose wrapped_st_ prefixes are to protect us from
@@ -199,7 +213,7 @@ struct stat_wrapper {
 #endif
     ffi_dev_t     wrapped_st_rdev;        /* device type (if inode device) */
     ffi_off_t     wrapped_st_size;        /* total size, in bytes */
-    unsigned long wrapped_st_blksize;     /* blocksize for filesystem I/O */
+    ffi_blksize_t wrapped_st_blksize;     /* blocksize for filesystem I/O */
     unsigned long wrapped_st_blocks;      /* number of blocks allocated */
     time_t        wrapped_st_atime;       /* time_t of last access */
     time_t        wrapped_st_mtime;       /* time_t of last modification */
@@ -420,3 +434,76 @@ int gettimeofday(long *timeval, long *timezone)
     return 0;
 }
 #endif
+
+
+/* We will need to define these things or their equivalents for Win32
+   eventually, but for now let's get it working for everyone else. */
+#ifndef LISP_FEATURE_WIN32
+/* From SB-BSD-SOCKETS, to get h_errno */
+int get_h_errno()
+{
+    return h_errno;
+}
+
+/* From SB-POSIX, wait-macros */
+int wifexited(int status) {
+    return WIFEXITED(status);
+}
+int wexitstatus(int status) {
+    return WEXITSTATUS(status);
+}
+int wifsignaled(int status) {
+    return WIFSIGNALED(status);
+}
+int wtermsig(int status) {
+    return WTERMSIG(status);
+}
+int wifstopped(int status) {
+    return WIFSTOPPED(status);
+}
+int wstopsig(int status) {
+    return WSTOPSIG(status);
+}
+/* FIXME: POSIX also defines WIFCONTINUED, but that appears not to
+   exist on at least Linux... */
+#endif  /* !LISP_FEATURE_WIN32 */
+
+/* From SB-POSIX, stat-macros */
+int s_isreg(mode_t mode)
+{
+    return S_ISREG(mode);
+}
+int s_isdir(mode_t mode)
+{
+    return S_ISDIR(mode);
+}
+int s_ischr(mode_t mode)
+{
+    return S_ISCHR(mode);
+}
+int s_isblk(mode_t mode)
+{
+    return S_ISBLK(mode);
+}
+int s_isfifo(mode_t mode)
+{
+    return S_ISFIFO(mode);
+}
+#ifndef LISP_FEATURE_WIN32
+int s_islnk(mode_t mode)
+{
+#ifdef S_ISLNK
+    return S_ISLNK(mode);
+#else
+    return ((mode & S_IFMT) == S_IFLNK);
+#endif
+}
+int s_issock(mode_t mode)
+{
+#ifdef S_ISSOCK
+    return S_ISSOCK(mode);
+#else
+    return ((mode & S_IFMT) == S_IFSOCK);
+#endif
+}
+#endif /* !LISP_FEATURE_WIN32 */