diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-07 02:40:22 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-07 02:40:22 +0000 |
| commit | ae229456fb3548b9a3b0804f22c4bd2c9c3a87d9 (patch) | |
| tree | 0db0792e8c8fb6ec8c30bffdf037da5a6c3a4854 /win32 | |
| parent | 4e19b0e00f437c15954733a0e93ebf47edada5d6 (diff) | |
* configure.in: add new configure option `--with-winsock2' for mingw.
* win32/Makefile.sub (config.h): define USE_WINSOCK2 in config.h
instead of in CPPFLAGS.
* ext/socket/extconf.rb: determine whether to use winsock2 or not
by using with_config.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index fa8e3dbfd7..975ef49899 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -142,9 +142,6 @@ CC = $(CC) -nologo LD = $(CC) LDSHARED = $(LD) -LD XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing -!if defined(USE_WINSOCK2) -CPPFLAGS = $(CPPFLAGS) -DUSE_WINSOCK2 -!endif !if $(MSC_VER) >= 1400 # Prevents VC++ 2005 (cl ver 14) warnings CPPFLAGS = $(CPPFLAGS) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE @@ -208,6 +205,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub #if _MSC_VER != $(MSC_VER) #error MSC version unmatch #endif +!if defined(USE_WINSOCK2) +#define USE_WINSOCK2 1 +!endif #define STDC_HEADERS 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 |