aboutsummaryrefslogtreecommitdiffstats
path: root/istream.c
diff options
context:
space:
mode:
authorDai Sato <satodai@w3m.jp>2006-04-05 14:18:53 +0000
committerDai Sato <satodai@w3m.jp>2006-04-05 14:18:53 +0000
commitbc7f9c90263523dc9c19c63c520cbc8f46c3cbdb (patch)
treee7632ff276fbfed9e41e487bad1375f46c1f4fa7 /istream.c
parentreplace pclose passed to localcgi_post/get() with fclose in openURL() (diff)
downloadw3m-bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb.tar.gz
w3m-bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb.zip
apply multiple patches on w3m-dev(-en) ML since Jun 2005 to Jan 2006.
Diffstat (limited to '')
-rw-r--r--istream.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/istream.c b/istream.c
index fe5847b..3344ab3 100644
--- a/istream.c
+++ b/istream.c
@@ -1,4 +1,4 @@
-/* $Id: istream.c,v 1.23 2003/10/20 16:41:56 ukai Exp $ */
+/* $Id: istream.c,v 1.24 2006/04/05 14:18:54 inu Exp $ */
#include "fm.h"
#include "myctype.h"
#include "istream.h"
@@ -6,6 +6,9 @@
#ifdef USE_SSL
#include <openssl/x509v3.h>
#endif
+#ifdef __MINGW32_VERSION
+#include <winsock.h>
+#endif
#define uchar unsigned char
@@ -617,13 +620,21 @@ ssl_get_certificate(SSL * ssl, char *hostname)
static void
basic_close(int *handle)
{
+#ifdef __MINGW32_VERSION
+ closesocket(*(int *)handle);
+#else
close(*(int *)handle);
+#endif
}
static int
basic_read(int *handle, char *buf, int len)
{
+#ifdef __MINGW32_VERSION
+ return recv(*(int *)handle, buf, len, 0);
+#else
return read(*(int *)handle, buf, len);
+#endif
}
static void