guile/guile-core/libguile ChangeLog backtrace.c...

[Martin Grabmueller]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Martin Grabmueller <address@hidden>     01/07/03 08:27:56

Modified files:
        guile-core/libguile: ChangeLog backtrace.c cpp_sig_symbols.in 
                             error.c ioext.c posix.c rw.c script.c 
                             unif.c 

Log message:
        * posix.c (getlogin): getlogin() implementation for Windows.
        
        * backtrace.c, ioext.c: Include <stdio.h>.
        
        * unif.c, script.c, rw.c, error.c: Include <io.h>, if it does
        exist.
        
        * cpp_sig_symbols.in: Added SIGBREAK.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ChangeLog.diff?cvsroot=OldCVS&tr1=1.1462&tr2=1.1463&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/backtrace.c.diff?cvsroot=OldCVS&tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/cpp_sig_symbols.in.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/error.c.diff?cvsroot=OldCVS&tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ioext.c.diff?cvsroot=OldCVS&tr1=1.84&tr2=1.85&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/posix.c.diff?cvsroot=OldCVS&tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/rw.c.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/script.c.diff?cvsroot=OldCVS&tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/unif.c.diff?cvsroot=OldCVS&tr1=1.119&tr2=1.120&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1462 
guile/guile-core/libguile/ChangeLog:1.1463
--- guile/guile-core/libguile/ChangeLog:1.1462  Sun Jul  1 04:58:22 2001
+++ guile/guile-core/libguile/ChangeLog Tue Jul  3 08:27:56 2001
@@ -1,3 +1,16 @@
+2001-07-03  Martin Grabmueller  <address@hidden>
+
+       Some more compatibility patches for Windows.
+       
+       * posix.c (getlogin): getlogin() implementation for Windows.
+
+       * backtrace.c, ioext.c: Include <stdio.h>.
+
+       * unif.c, script.c, rw.c, error.c: Include <io.h>, if it does
+       exist.
+
+       * cpp_sig_symbols.in: Added SIGBREAK.
+
 2001-07-01  Marius Vollmer  <address@hidden>
 
        * strports.c (scm_read_0str, scm_eval_0str): Call
Index: guile/guile-core/libguile/backtrace.c
diff -u guile/guile-core/libguile/backtrace.c:1.69 
guile/guile-core/libguile/backtrace.c:1.70
--- guile/guile-core/libguile/backtrace.c:1.69  Tue Jun 26 10:53:09 2001
+++ guile/guile-core/libguile/backtrace.c       Tue Jul  3 08:27:56 2001
@@ -47,6 +47,7 @@
    address@hidden, http://www.cs.washington.edu/homes/gjb */
 
 
+#include <stdio.h>
 #include <ctype.h>
 
 #include "libguile/_scm.h"
Index: guile/guile-core/libguile/cpp_sig_symbols.in
diff -u guile/guile-core/libguile/cpp_sig_symbols.in:1.1 
guile/guile-core/libguile/cpp_sig_symbols.in:1.2
--- guile/guile-core/libguile/cpp_sig_symbols.in:1.1    Sat Apr  5 15:35:03 1997
+++ guile/guile-core/libguile/cpp_sig_symbols.in        Tue Jul  3 08:27:56 2001
@@ -1,5 +1,6 @@
 SIGABRT
 SIGALRM
+SIGBREAK
 SIGBUS
 SIGCHLD
 SIGCLD
Index: guile/guile-core/libguile/error.c
diff -u guile/guile-core/libguile/error.c:1.62 
guile/guile-core/libguile/error.c:1.63
--- guile/guile-core/libguile/error.c:1.62      Wed Jun 27 18:11:58 2001
+++ guile/guile-core/libguile/error.c   Tue Jul  3 08:27:56 2001
@@ -61,6 +61,11 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+
+/* For Windows... */
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
 
 
Index: guile/guile-core/libguile/ioext.c
diff -u guile/guile-core/libguile/ioext.c:1.84 
guile/guile-core/libguile/ioext.c:1.85
--- guile/guile-core/libguile/ioext.c:1.84      Thu Jun 14 12:50:43 2001
+++ guile/guile-core/libguile/ioext.c   Tue Jul  3 08:27:56 2001
@@ -44,6 +44,7 @@
 
 
 
+#include <stdio.h>
 #include <errno.h>
 
 #include "libguile/_scm.h"
Index: guile/guile-core/libguile/posix.c
diff -u guile/guile-core/libguile/posix.c:1.91 
guile/guile-core/libguile/posix.c:1.92
--- guile/guile-core/libguile/posix.c:1.91      Tue Jun 26 10:53:09 2001
+++ guile/guile-core/libguile/posix.c   Tue Jul  3 08:27:56 2001
@@ -103,6 +103,7 @@
 
 #ifdef __MINGW32__
 /* Some defines for Windows here. */
+# include <process.h>
 # define pipe(fd) _pipe (fd, 256, O_BINARY)
 #endif /* __MINGW32__ */
 
@@ -576,7 +577,6 @@
   return SCM_MAKINUM (0L + getuid ());
 }
 #undef FUNC_NAME
-#endif /* __MINGW32__ */
 
 
 
@@ -675,7 +675,9 @@
   return SCM_UNSPECIFIED;
 }
 #undef FUNC_NAME
+#endif /* __MINGW32__ */
 
+
 #ifdef HAVE_SETEGID
 SCM_DEFINE (scm_setegid, "setegid", 1, 0, 0, 
             (SCM id),
@@ -1382,6 +1384,21 @@
 }
 #undef FUNC_NAME
 #endif /* HAVE_CHROOT */
+
+
+#ifdef __MINGW32__
+/* Wrapper function to supplying `getlogin()' under Windows.  */
+static char * getlogin (void)
+{
+  static char user[256];
+  static unsigned long len = 256;
+
+  if (!GetUserName (user, &len))
+    return NULL;
+  return user;
+}
+#endif /* __MINGW32__ */
+
 
 #if HAVE_GETLOGIN
 SCM_DEFINE (scm_getlogin, "getlogin", 0, 0, 0, 
Index: guile/guile-core/libguile/rw.c
diff -u guile/guile-core/libguile/rw.c:1.9 guile/guile-core/libguile/rw.c:1.10
--- guile/guile-core/libguile/rw.c:1.9  Wed Jun 20 10:33:43 2001
+++ guile/guile-core/libguile/rw.c      Tue Jul  3 08:27:56 2001
@@ -59,6 +59,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
 
 
Index: guile/guile-core/libguile/script.c
diff -u guile/guile-core/libguile/script.c:1.43 
guile/guile-core/libguile/script.c:1.44
--- guile/guile-core/libguile/script.c:1.43     Wed Jun 27 18:11:59 2001
+++ guile/guile-core/libguile/script.c  Tue Jul  3 08:27:56 2001
@@ -64,6 +64,10 @@
 #include <unistd.h>            /* for X_OK define */
 #endif
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
 /* Concatentate str2 onto str1 at position n and return concatenated
    string if file exists; 0 otherwise. */
 
Index: guile/guile-core/libguile/unif.c
diff -u guile/guile-core/libguile/unif.c:1.119 
guile/guile-core/libguile/unif.c:1.120
--- guile/guile-core/libguile/unif.c:1.119      Sat Jun 30 12:56:57 2001
+++ guile/guile-core/libguile/unif.c    Tue Jul  3 08:27:56 2001
@@ -74,6 +74,10 @@
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
 
 /* The set of uniform scm_vector types is:
  *  Vector of:          Called: