diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-17 08:11:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-17 08:11:21 +0000 |
| commit | d66c5768caaee16a0c2c2c6411858d23fb9f21a9 (patch) | |
| tree | ae574138bb2da56bf29ee92f0479c08f9d627c54 /win32/Makefile.sub | |
| parent | 8ac4f421e13adc2216b4056ab241136066548e7e (diff) | |
win32.c: check by module handles
* win32/win32.c (console_emulator_p): check by comparison between
module handle of WriteConsoleW and kernel32.dll.
* configure.in, win32/Makefile.sub, win32/setup.mak: no longer need
psapi.lib.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ba936d2031..ee763402b8 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -232,7 +232,7 @@ LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib !if $(MSC_VER) >= 1400 LIBS = $(LIBS) iphlpapi.lib !endif -LIBS = $(LIBS) psapi.lib imagehlp.lib shlwapi.lib $(EXTLIBS) +LIBS = $(LIBS) imagehlp.lib shlwapi.lib $(EXTLIBS) !endif !if !defined(MISSING) MISSING = acosh.obj cbrt.obj crypt.obj erf.obj ffs.obj langinfo.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32/win32.obj win32/file.obj setproctitle.obj @@ -308,9 +308,6 @@ STACK = $(STACK),$(STACK_COMMIT) !endif ORGLIBPATH = $(LIB) -!if !defined(HAVE_PSAPI_H) -HAVE_PSAPI_H = 0 -!endif #### End of system configuration section. #### LIBRUBY_A = $(RUBY_SO_NAME)-static.lib @@ -681,9 +678,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define HAVE_DAYLIGHT 1 #define HAVE_GMTIME_R 1 #define HAVE_TYPE_NET_LUID 1 -!if $(HAVE_PSAPI_H) -#define HAVE_PSAPI_H 1 -!endif #define SETPGRP_VOID 1 #define RSHIFT(x,y) ((x)>>(int)y) #define HAVE_RB_FD_INIT 1 |