diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-18 03:50:47 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-18 03:50:47 +0000 |
| commit | 78604644e280daab370e6415f588606998bd4d73 (patch) | |
| tree | df68c2ee86be5de9a0a4851c9930f04b022fd455 | |
| parent | 17223d352008a0de9df97a8a8e90d878f91f261b (diff) | |
* bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24.
I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally.
[ruby-dev:26806]
* win32/win32.h: include winsock2.h instead of winsock.h. (bcc32)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | win32/win32.h | 5 |
3 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Thu Aug 18 12:46:28 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24. + I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally. + [ruby-dev:26806] + + * win32/win32.h: include winsock2.h instead of winsock.h. (bcc32) + Wed Aug 17 23:58:05 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * object.c (rb_to_integer): argument constified. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 58048e39ad..5d7b60197a 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -385,7 +385,7 @@ s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}. s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN;t t -s,@COMMON_HEADERS@,windows.h winsock.h,;t t +s,@COMMON_HEADERS@,winsock2.h windows.h,;t t s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t s,@EXPORT_PREFIX@,_,;t t s,@arch@,$(ARCH)-$(OS),;t t diff --git a/win32/win32.h b/win32/win32.h index 76d10cb50d..a75662b30b 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -22,8 +22,13 @@ // There is function-name conflitct, so we rename it #if !defined(IN) && !defined(FLOAT) #define OpenFile WINAPI_OpenFile +#ifdef __BORLANDC__ +#include <winsock2.h> +#include <windows.h> +#else #include <windows.h> #include <winsock.h> +#endif #undef OpenFile #endif |