diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-10 04:55:34 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-10 04:55:34 +0000 |
| commit | a32bc08d36360adf59806908ebe790ff03f689a2 (patch) | |
| tree | aff30ce96dfe57baca2258006515aa59f57e8988 /win32 | |
| parent | 0de28773260c8c47dec6a39711765c27acc646de (diff) | |
| download | ruby-a32bc08d36360adf59806908ebe790ff03f689a2.tar.gz | |
* configure.in, win32/Makefile.sub (LIBS, COMMON_HEADERS): use
winsock2 on mswin32/mingw.
* ext/socket/extconf.rb: ditto.
* win32/win32.c (StartSockets): ditto.
* win32/win32.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 2 | ||||
| -rw-r--r-- | win32/win32.c | 14 | ||||
| -rw-r--r-- | win32/win32.h | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index b45d9bc339..95007145e1 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -126,7 +126,7 @@ RFLAGS = -r !if !defined(EXTLIBS) EXTLIBS = !endif -LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib wsock32.lib $(EXTLIBS) +LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib $(EXTLIBS) MISSING = acosh.obj crypt.obj erf.obj win32.obj ARFLAGS = -machine:$(MACHINE) -out: diff --git a/win32/win32.c b/win32/win32.c index 166d58e792..ea379c754a 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1972,21 +1972,17 @@ StartSockets(void) { WORD version; WSADATA retdata; - int ret; int iSockOpt; // // initalize the winsock interface and insure that it's // cleaned up at exit. // - version = MAKEWORD(1, 1); - if (ret = WSAStartup(version, &retdata)) + version = MAKEWORD(2, 0); + if (WSAStartup(version, &retdata)) rb_fatal ("Unable to locate winsock library!\n"); - if (LOBYTE(retdata.wVersion) != 1) - rb_fatal("could not find version 1 of winsock dll\n"); - - if (HIBYTE(retdata.wVersion) != 1) - rb_fatal("could not find version 1 of winsock dll\n"); + if (LOBYTE(retdata.wVersion) != 2) + rb_fatal("could not find version 2 of winsock dll\n"); atexit((void (*)(void)) WSACleanup); @@ -3658,7 +3654,7 @@ rb_w32_fopen(const char *path, const char *mode) } FILE * -rb_w32_fdopen(int handle, char *type) +rb_w32_fdopen(int handle, const char *type) { FILE *f = (errno = 0, _fdopen(handle, type)); if (f == NULL && errno == 0) { diff --git a/win32/win32.h b/win32/win32.h index 58538b26ee..25e949a7a9 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -22,8 +22,8 @@ // There is function-name conflitct, so we rename it #if !defined(IN) && !defined(FLOAT) #define OpenFile WINAPI_OpenFile +#include <winsock2.h> #include <windows.h> -#include <winsock.h> #undef OpenFile #endif |