diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-03-09 16:39:47 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-03-09 16:47:21 +0100 |
| commit | 09b204d38756f0fa9ab4319874c8ce2838488dd0 (patch) | |
| tree | 0e338d1eaf251b6dfa2ba81770231281a1d3d469 /libguile/socket.c | |
| parent | 7e369c38993cc7cf4063a6cadc8496552abf323d (diff) | |
squish remove some mingw-specific code that is covered by gnulib
* libguile/socket.c (scm_init_socket): Remove mingw-specific code.
* libguile/fports.c: Remove ftruncate redefine; mingw is fine.
(scm_i_fdes_to_port): If we have no F_GETFL, just do an fstat. The
right place for an F_GETFL replacement would be in gnulib.
(fport_input_waiting): Remove an outdated comment.
* libguile/error.c (SCM_I_STRERROR, SCM_I_ERRNO): Remove, replacing uses
with strerror and errno.
* libguile/win32-socket.c:
* libguile/win32-socket.h: Remove. Mingw has suitable replacements.
* configure.ac:
* libguile/Makefile.am (EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES):
(noinst_HEADERS): Update for win32-socket removal.
Diffstat (limited to 'libguile/socket.c')
| -rw-r--r-- | libguile/socket.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libguile/socket.c b/libguile/socket.c index 5119ce3c6..ecb6754ae 100644 --- a/libguile/socket.c +++ b/libguile/socket.c @@ -1,5 +1,5 @@ /* Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, - * 2006, 2007, 2009, 2011, 2012 Free Software Foundation, Inc. + * 2006, 2007, 2009, 2011, 2012, 2013 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -44,11 +44,6 @@ # include "libguile/deprecation.h" #endif -#ifdef __MINGW32__ -#include "win32-socket.h" -#include <netdb.h> -#endif - #ifdef HAVE_STDINT_H #include <stdint.h> #endif @@ -59,9 +54,6 @@ #include <unistd.h> #endif #include <sys/types.h> -#ifdef HAVE_WINSOCK2_H -#include <winsock2.h> -#else #include <sys/socket.h> #ifdef HAVE_UNIX_DOMAIN_SOCKETS #include <sys/un.h> @@ -69,7 +61,7 @@ #include <netinet/in.h> #include <netdb.h> #include <arpa/inet.h> -#endif + #if defined (HAVE_UNIX_DOMAIN_SOCKETS) && !defined (SUN_LEN) #define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ @@ -1877,10 +1869,6 @@ scm_init_socket () scm_c_define ("MSG_DONTROUTE", scm_from_int (MSG_DONTROUTE)); #endif -#ifdef __MINGW32__ - scm_i_init_socket_Win32 (); -#endif - #ifdef IP_ADD_MEMBERSHIP scm_c_define ("IP_ADD_MEMBERSHIP", scm_from_int (IP_ADD_MEMBERSHIP)); scm_c_define ("IP_DROP_MEMBERSHIP", scm_from_int (IP_DROP_MEMBERSHIP)); |