kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

win32/setup.mak: check psapi.h

Browse source 
* win32/setup.mak (check-psapi.h): check if psapi.h is available.

* win32/win32.c (CHECK_CONSOLE_EMULATOR): enable console emulator DLL
  check only when psapi.h is available.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-10-16 13:50:29 +00:00
parent 8ead78806c
commit a8c6a52a1a
3 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
win32/Makefile.sub
View file

@ -678,6 +678,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define HAVE_DAYLIGHT 1 #define HAVE_DAYLIGHT 1
#define HAVE_GMTIME_R 1 #define HAVE_GMTIME_R 1
#define HAVE_TYPE_NET_LUID 1 #define HAVE_TYPE_NET_LUID 1
!if defined(HAVE_PSAPI_H) && $(HAVE_PSAPI_H)
#define HAVE_PSAPI_H 1
!endif
#define SETPGRP_VOID 1 #define SETPGRP_VOID 1
#define RSHIFT(x,y) ((x)>>(int)y) #define RSHIFT(x,y) ((x)>>(int)y)
#define HAVE_RB_FD_INIT 1 #define HAVE_RB_FD_INIT 1

15
win32/setup.mak
View file

@ -70,11 +70,11 @@ USE_RUBYGEMS = $(USE_RUBYGEMS)
@echo !endif>> $(MAKEFILE) @echo !endif>> $(MAKEFILE)
!endif !endif
-system-vars-: -osname- -runtime- -system-vars-: -osname- -runtime- -headers-
-system-vars32-: -osname32- -runtime- -system-vars32-: -osname32- -runtime- -headers-
-system-vars64-: -osname64- -runtime- -system-vars64-: -osname64- -runtime- -headers-
-osname32-: nul -osname32-: nul
@echo TARGET_OS = mswin32>>$(MAKEFILE) @echo TARGET_OS = mswin32>>$(MAKEFILE)
@ -100,6 +100,15 @@ int main(void) {FILE *volatile f = stdin; return 0;}
@$(WIN32DIR:/=\)\rtname conftest.exe >>$(MAKEFILE) @$(WIN32DIR:/=\)\rtname conftest.exe >>$(MAKEFILE)
@$(WIN32DIR:/=\)\rm.bat conftest.* @$(WIN32DIR:/=\)\rm.bat conftest.*
-headers-: check-psapi.h
check-psapi.h: nul
($(CC) -MD <<conftest.c psapi.lib -link && echo>>$(MAKEFILE) HAVE_PSAPI_H=1) & $(WIN32DIR:/=\)\rm.bat conftest.*
#include <windows.h>
#include <psapi.h>
int main(void) {return (EnumProcesses(NULL,0,NULL) ? 0 : 1);}
<<
-version-: nul -version-: nul
@$(APPEND) @$(APPEND)
@$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE) @$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE)

13
win32/win32.c
View file

@ -39,7 +39,12 @@
#include <share.h> #include <share.h>
#include <shlobj.h> #include <shlobj.h>
#include <mbstring.h> #include <mbstring.h>
#ifdef HAVE_PSAPI_H
#include <psapi.h> #include <psapi.h>
# define CHECK_CONSOLE_EMULATOR 1
#else
# define CHECK_CONSOLE_EMULATOR 0
#endif
#include <shlwapi.h> #include <shlwapi.h>
#if _MSC_VER >= 1400 #if _MSC_VER >= 1400
#include <crtdbg.h> #include <crtdbg.h>
@ -606,7 +611,11 @@ static CRITICAL_SECTION select_mutex;
static int NtSocketsInitialized = 0; static int NtSocketsInitialized = 0;
static st_table *socklist = NULL; static st_table *socklist = NULL;
static st_table *conlist = NULL; static st_table *conlist = NULL;
#if CHECK_CONSOLE_EMULATOR
#define conlist_disabled ((st_table *)-1) #define conlist_disabled ((st_table *)-1)
#else
#define conlist_disabled ((st_table *)NULL)
#endif
static char *envarea; static char *envarea;
static char *uenvarea; static char *uenvarea;
@ -5834,6 +5843,7 @@ rb_w32_pipe(int fds[2])
return 0; return 0;
} }
#if CHECK_CONSOLE_EMULATOR
/* License: Ruby's */ /* License: Ruby's */
static int static int
console_emulator_p(void) console_emulator_p(void)
@ -5860,6 +5870,9 @@ console_emulator_p(void)
return 0; return 0;
} }
#else
#define console_emulator_p() 0
#endif
/* License: Ruby's */ /* License: Ruby's */
static struct constat * static struct constat *