scsh-users
[Top] [All Lists]

scsh-0.5.1 under i386 GNU/Linux with glibc2

To: scsh-bugs@martigny.ai.mit.edu
Subject: scsh-0.5.1 under i386 GNU/Linux with glibc2
From: Ian Grant <I.A.N.Grant@damtp.cam.ac.uk>
Date: Sun, 8 Nov 1998 12:40:34 +0000 (GMT)
I forgot the patches. Here they are.

Ian

--- scsh-0.5.1/dynload.c.orig   Sun Nov  8 11:24:29 1998
+++ scsh-0.5.1/dynload.c        Sun Nov  8 11:26:56 1998
@@ -37,6 +37,7 @@
 #endif
 
 #ifdef HAVE_LIBGEN_H
+#ifndef __GLIBC__
 #include <libgen.h>
 /* if we have pathfind, get the file name with $LD_LIBRARY_PATH or 
$S48_EXTERN_PATH */
 static char *shared_object_name(char *name)
@@ -51,6 +52,9 @@
   return name;
 } /* end of shared_object_name */
 #define SHARED_OBJECT_NAME(Name) shared_object_name(Name)
+#else /* __GLIBC__ */
+#define SHARED_OBJECT_NAME(Name) (Name)
+#endif
 #else /* no HAVE_LIBGEN_H */
 #define SHARED_OBJECT_NAME(Name) (Name)
 #endif /*HAVE_LIBGEN_H*/
--- scsh-0.5.1/scsh/linux/sigset.h.orig Sun Nov  8 11:17:03 1998
+++ scsh-0.5.1/scsh/linux/sigset.h      Sun Nov  8 12:04:30 1998
@@ -2,9 +2,21 @@
 ** These macros are OS-dependent, and must be defined per-OS.
 */
 
+#ifdef __GLIBC__
+/* We are really not supposed to mess around down here. We should use
+   the POSIX interface instead. */
+#define make_sigset(maskp, hi, lo) (*((unsigned long int *)maskp)=(((unsigned 
long int)hi)<<24)|(lo))
+
+/* Not a procedure: */
+#define split_sigset(mask, hip, lop) \
+       ((*(hip)=(mask.__val[0]>>24)&0xff), \
+        (*(lop)=(mask.__val[0]&0xffffff)))
+#else
+
 #define make_sigset(maskp, hi, lo) (*maskp=((hi)<<24)|(lo))
 
 /* Not a procedure: */
 #define split_sigset(mask, hip, lop) \
        ((*(hip)=(mask>>24)&0xff), \
         (*(lop)=(mask&0xffffff)))
+#endif
--- scsh-0.5.1/scsh/network.c.orig      Sun Nov  8 10:46:34 1998
+++ scsh-0.5.1/scsh/network.c   Sun Nov  8 10:49:01 1998
@@ -57,7 +57,9 @@
 
 scheme_value df_listen(long nargs, scheme_value *args)
 {
+#ifndef __GLIBC__
     extern int listen(int , int );
+#endif
     scheme_value ret1;
     int r1;
 
--- scsh-0.5.1/Makefile.in.orig Sun Nov  8 12:28:12 1998
+++ scsh-0.5.1/Makefile.in      Sun Nov  8 12:27:30 1998
@@ -317,6 +317,10 @@
        mkdir $(LIB)/misc
 $(LIB)/link:
        mkdir $(LIB)/link
+$(LIB)/vm:
+       mkdir $(LIB)/vm
+$(LIB)/doc:
+       mkdir $(LIB)/doc
 
 configure: configure.in
        cd $(srcdir); autoconf
<Prev in Thread] Current Thread [Next in Thread>