guile/guile-core ChangeLog configure.in libguil...

[Stefan Jahn]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Stefan Jahn <address@hidden>    01/11/07 10:08:45

Modified files:
        guile-core     : ChangeLog configure.in 
        guile-core/libguile: ChangeLog Makefile.am error.c numbers.c 
                             numbers.h socket.c win32-dirent.h 
                             win32-uname.h 
Added files:
        guile-core/libguile: win32-socket.c win32-socket.h 

Log message:
        2001-11-07  Stefan Jahn  <address@hidden>
        
        * configure.in: Include `win32-socket.o' in the list of object
        files if networking is enabled on Win32.
        
        2001-11-07  Stefan Jahn  <address@hidden>
        
        * win32-socket.[ch]: New files.  Defines Winsock-API error codes
        and makes them available through Guile.  That is because the
        Winsock-API does not store its errors in `errno' and thus cannot
        return error messages via `strerror (errno)'.
        
        * socket.c (scm_init_socket): Initialize `win32-socket' part
        here under M$-Windows.
        
        * numbers.h: Added missing declaration of
        `scm_sys_check_number_conversions()'.
        
        * error.c: Local definition of SCM_I_STRERROR and SCM_I_ERRNO
        and use in `(strerror)' and `(system-error)'.
        
        * Makefile.am (EXTRA_libguile_la_SOURCES): Added
        `win32-socket.[ch]' to extra source and header files.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/ChangeLog.diff?cvsroot=OldCVS&tr1=1.314&tr2=1.315&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/configure.in.diff?cvsroot=OldCVS&tr1=1.170&tr2=1.171&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/win32-socket.c?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/win32-socket.h?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ChangeLog.diff?cvsroot=OldCVS&tr1=1.1543&tr2=1.1544&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/Makefile.am.diff?cvsroot=OldCVS&tr1=1.147&tr2=1.148&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/error.c.diff?cvsroot=OldCVS&tr1=1.66&tr2=1.67&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/numbers.c.diff?cvsroot=OldCVS&tr1=1.149&tr2=1.150&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/numbers.h.diff?cvsroot=OldCVS&tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/socket.c.diff?cvsroot=OldCVS&tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/win32-dirent.h.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/win32-uname.h.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: guile/guile-core/ChangeLog
diff -u guile/guile-core/ChangeLog:1.314 guile/guile-core/ChangeLog:1.315
--- guile/guile-core/ChangeLog:1.314    Tue Nov  6 21:55:40 2001
+++ guile/guile-core/ChangeLog  Wed Nov  7 10:08:45 2001
@@ -1,3 +1,8 @@
+2001-11-07  Stefan Jahn  <address@hidden>
+
+       * configure.in: Include `win32-socket.o' in the list of object
+       files if networking is enabled on Win32.
+
 2001-11-06  Thien-Thi Nguyen  <address@hidden>
 
        * TODO (sync srfi-modules.texi): New, done.
Index: guile/guile-core/configure.in
diff -u guile/guile-core/configure.in:1.170 guile/guile-core/configure.in:1.171
--- guile/guile-core/configure.in:1.170 Sun Nov  4 10:52:29 2001
+++ guile/guile-core/configure.in       Wed Nov  7 10:08:45 2001
@@ -233,7 +233,10 @@
       [Define if you have the <winsock2.h> header file.])])
     AC_CHECK_LIB(ws2_32, main)
     LIBOBJS="$LIBOBJS win32-uname.o win32-dirent.o"
-    if test $enable_shared = yes ; then
+    if test "$enable_networking" = yes ; then
+      LIBOBJS="$LIBOBJS win32-socket.o"
+    fi
+    if test "$enable_shared" = yes ; then
       EXTRA_DEFS="-DSCM_IMPORT"
       AC_DEFINE(USE_DLL_IMPORT, 1,
         [Define if you need additional CPP macros on Win32 platforms.])
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1543 
guile/guile-core/libguile/ChangeLog:1.1544
--- guile/guile-core/libguile/ChangeLog:1.1543  Mon Nov  5 18:12:20 2001
+++ guile/guile-core/libguile/ChangeLog Wed Nov  7 10:08:45 2001
@@ -1,3 +1,22 @@
+2001-11-07  Stefan Jahn  <address@hidden>
+
+       * win32-socket.[ch]: New files.  Defines Winsock-API error codes
+       and makes them available through Guile.  That is because the
+       Winsock-API does not store its errors in `errno' and thus cannot
+       return error messages via `strerror (errno)'.
+
+       * socket.c (scm_init_socket): Initialize `win32-socket' part
+       here under M$-Windows.
+
+       * numbers.h: Added missing declaration of 
+       `scm_sys_check_number_conversions()'.
+
+       * error.c: Local definition of SCM_I_STRERROR and SCM_I_ERRNO
+       and use in `(strerror)' and `(system-error)'.
+
+       * Makefile.am (EXTRA_libguile_la_SOURCES): Added 
+       `win32-socket.[ch]' to extra source and header files.
+
 2001-11-06  Marius Vollmer  <address@hidden>
 
        * script.c (scm_shell_usage, scm_compile_shell_switches): Prepend
Index: guile/guile-core/libguile/Makefile.am
diff -u guile/guile-core/libguile/Makefile.am:1.147 
guile/guile-core/libguile/Makefile.am:1.148
--- guile/guile-core/libguile/Makefile.am:1.147 Sun Nov  4 10:52:29 2001
+++ guile/guile-core/libguile/Makefile.am       Wed Nov  7 10:08:45 2001
@@ -94,7 +94,8 @@
     alloca.c inet_aton.c memmove.c putenv.c strerror.c \
     threads.c regex-posix.c                            \
     filesys.c posix.c net_db.c socket.c                        \
-    ramap.c unif.c debug-malloc.c mkstemp.c win32-uname.c win32-dirent.c
+    ramap.c unif.c debug-malloc.c mkstemp.c             \
+    win32-uname.c win32-dirent.c win32-socket.c
 
 ## In next release, threads will be factored out of libguile.
 ## Until then, the machine specific headers is a temporary kludge.
@@ -112,7 +113,8 @@
 ## Perhaps we can deal with them normally once the merge seems to be
 ## working.
 noinst_HEADERS = coop-threads.c coop-threads.h coop.c \
-                num2integral.i.c num2float.i.c win32-uname.h win32-dirent.h
+    num2integral.i.c num2float.i.c                    \
+    win32-uname.h win32-dirent.h win32-socket.h
 
 libguile_la_DEPENDENCIES = @LIBLOBJS@
 libguile_la_LIBADD = @LIBLOBJS@ $(LIBLTDL) $(THREAD_LIBS_LOCAL)
Index: guile/guile-core/libguile/error.c
diff -u guile/guile-core/libguile/error.c:1.66 
guile/guile-core/libguile/error.c:1.67
--- guile/guile-core/libguile/error.c:1.66      Thu Sep 20 04:18:26 2001
+++ guile/guile-core/libguile/error.c   Wed Nov  7 10:08:45 2001
@@ -151,6 +151,17 @@
 }
 #undef FUNC_NAME
 
+#ifdef __MINGW32__
+# include "win32-socket.h"
+# define SCM_I_STRERROR(err) \
+    ((err >= WSABASEERR) ? scm_i_socket_strerror (err) : strerror (err))
+# define SCM_I_ERRNO() \
+    (errno ? errno : scm_i_socket_errno ())
+#else
+# define SCM_I_STRERROR(err) strerror (err)
+# define SCM_I_ERRNO() errno
+#endif /* __MINGW32__ */
+
 SCM_DEFINE (scm_strerror, "strerror", 1, 0, 0, 
             (SCM err),
            "Return the Unix error message corresponding to @var{err}, which\n"
@@ -158,7 +169,7 @@
 #define FUNC_NAME s_scm_strerror
 {
   SCM_VALIDATE_INUM (1,err);
-  return scm_makfrom0str (strerror (SCM_INUM (err)));
+  return scm_makfrom0str (SCM_I_STRERROR (SCM_INUM (err)));
 }
 #undef FUNC_NAME
 
@@ -166,12 +177,12 @@
 void
 scm_syserror (const char *subr)
 {
-  int save_errno = errno;
+  int save_errno = SCM_I_ERRNO ();
   
   scm_error (scm_system_error_key,
             subr,
             "~A",
-            scm_cons (scm_makfrom0str (strerror (save_errno)), SCM_EOL),
+            scm_cons (scm_makfrom0str (SCM_I_STRERROR (save_errno)), SCM_EOL),
             scm_cons (SCM_MAKINUM (save_errno), SCM_EOL));
 }
 
Index: guile/guile-core/libguile/numbers.c
diff -u guile/guile-core/libguile/numbers.c:1.149 
guile/guile-core/libguile/numbers.c:1.150
--- guile/guile-core/libguile/numbers.c:1.149   Sun Nov  4 10:52:29 2001
+++ guile/guile-core/libguile/numbers.c Wed Nov  7 10:08:45 2001
@@ -4448,7 +4448,7 @@
 }
   
 SCM_DEFINE (scm_sys_check_number_conversions, "%check-number-conversions", 0, 
0, 0, 
-            (),
+            (void),
            "Number conversion sanity checking.")
 #define FUNC_NAME s_scm_sys_check_number_conversions
 {
Index: guile/guile-core/libguile/numbers.h
diff -u guile/guile-core/libguile/numbers.h:1.61 
guile/guile-core/libguile/numbers.h:1.62
--- guile/guile-core/libguile/numbers.h:1.61    Thu Nov  1 19:19:11 2001
+++ guile/guile-core/libguile/numbers.h Wed Nov  7 10:08:45 2001
@@ -333,6 +333,10 @@
 SCM_API double scm_num2double (SCM num, unsigned long int pos,
                               const char *s_caller);
 
+#ifdef GUILE_DEBUG
+SCM_API SCM scm_sys_check_number_conversions (void);
+#endif
+
 SCM_API void scm_init_numbers (void);
 
 #endif  /* SCM_NUMBERS_H */
Index: guile/guile-core/libguile/socket.c
diff -u guile/guile-core/libguile/socket.c:1.82 
guile/guile-core/libguile/socket.c:1.83
--- guile/guile-core/libguile/socket.c:1.82     Fri Aug 31 10:42:31 2001
+++ guile/guile-core/libguile/socket.c  Wed Nov  7 10:08:45 2001
@@ -54,6 +54,10 @@
 #include "libguile/validate.h"
 #include "libguile/socket.h"
 
+#ifdef __MINGW32__
+#include "win32-socket.h"
+#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -1381,6 +1385,10 @@
 #endif
 #ifdef MSG_DONTROUTE
   scm_c_define ("MSG_DONTROUTE", SCM_MAKINUM (MSG_DONTROUTE));
+#endif
+
+#ifdef __MINGW32__
+  scm_i_init_socket_Win32 ();
 #endif
 
   scm_add_feature ("socket");
Index: guile/guile-core/libguile/win32-dirent.h
diff -u guile/guile-core/libguile/win32-dirent.h:1.1 
guile/guile-core/libguile/win32-dirent.h:1.2
--- guile/guile-core/libguile/win32-dirent.h:1.1        Thu Nov  1 18:23:41 2001
+++ guile/guile-core/libguile/win32-dirent.h    Wed Nov  7 10:08:45 2001
@@ -1,7 +1,7 @@
 /* classes: h_files */
 
-#ifndef SCM_DIRENT_H
-#define SCM_DIRENT_H
+#ifndef SCM_WIN32_DIRENT_H
+#define SCM_WIN32_DIRENT_H
 
 /* Copyright (C) 2001 Free Software Foundation, Inc.
  *
@@ -85,4 +85,4 @@
 off_t telldir (DIR * dir);
 int dirfd (DIR * dir);
 
-#endif /* SCM_DIRENT_H */
+#endif /* SCM_WIN32_DIRENT_H */
Index: guile/guile-core/libguile/win32-uname.h
diff -u guile/guile-core/libguile/win32-uname.h:1.1 
guile/guile-core/libguile/win32-uname.h:1.2
--- guile/guile-core/libguile/win32-uname.h:1.1 Thu Nov  1 18:23:41 2001
+++ guile/guile-core/libguile/win32-uname.h     Wed Nov  7 10:08:45 2001
@@ -1,7 +1,7 @@
 /* classes: h_files */
 
-#ifndef SCM_UNAME_H
-#define SCM_UNAME_H
+#ifndef SCM_WIN32_UNAME_H
+#define SCM_WIN32_UNAME_H
 
 /* Copyright (C) 2001 Free Software Foundation, Inc.
  *
@@ -70,6 +70,6 @@
   char domainname[_UTSNAME_DOMAIN_LENGTH];
 };
 
-int uname (struct utsname *uts);
+int uname (struct utsname * uts);
 
-#endif /* SCM_UNAME_H */
+#endif /* SCM_WIN32_UNAME_H */