* 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.

libguile/ChangeLog

@@ -1,3 +1,16 @@
+2001-07-03  Martin Grabmueller  <mgrabmue@cs.tu-berlin.de>
+
+	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  <mvo@zagadka.ping.de>
 
 	* strports.c (scm_read_0str, scm_eval_0str): Call

libguile/backtrace.c

@@ -47,6 +47,7 @@
    gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
 
 
+#include <stdio.h>
 #include <ctype.h>
 
 #include "libguile/_scm.h"

libguile/cpp_sig_symbols.in

@@ -1,5 +1,6 @@
 SIGABRT
 SIGALRM
+SIGBREAK
 SIGBUS
 SIGCHLD
 SIGCLD

libguile/error.c

@@ -61,6 +61,11 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+
+/* For Windows... */
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
 
 

libguile/ioext.c

@@ -44,6 +44,7 @@
 
 
 
+#include <stdio.h>
 #include <errno.h>
 
 #include "libguile/_scm.h"

libguile/posix.c

@@ -103,6 +103,7 @@ extern char *ttyname();
 
 #ifdef __MINGW32__
 /* Some defines for Windows here. */
+# include <process.h>
 # define pipe(fd) _pipe (fd, 256, O_BINARY)
 #endif /* __MINGW32__ */
 
@@ -576,7 +577,6 @@ SCM_DEFINE (scm_getuid, "getuid", 0, 0, 0,
   return SCM_MAKINUM (0L + getuid ());
 }
 #undef FUNC_NAME
-#endif /* __MINGW32__ */
 
 
 
@@ -675,6 +675,8 @@ SCM_DEFINE (scm_seteuid, "seteuid", 1, 0, 0,
   return SCM_UNSPECIFIED;
 }
 #undef FUNC_NAME
+#endif /* __MINGW32__ */
+
 
 #ifdef HAVE_SETEGID
 SCM_DEFINE (scm_setegid, "setegid", 1, 0, 0, 
@@ -1383,6 +1385,21 @@ SCM_DEFINE (scm_chroot, "chroot", 1, 0, 0,
 #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, 
             (void),

libguile/rw.c

@@ -59,6 +59,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
 
 

libguile/script.c

@@ -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. */
 

libguile/unif.c

@@ -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: