diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-05-15 22:45:35 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-05-15 22:45:35 +0200 |
| commit | 34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b (patch) | |
| tree | f9c20aa7c8a55c9670ee4d456e895679c80fb45e /win32/signal.h | |
| parent | 6868b56e25e6ce80418219bd876ee2de7646cf63 (diff) | |
| parent | 230b435ed40fe40931ae3f32f319cfff328ac2fe (diff) | |
| download | php-git-34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'win32/signal.h')
| -rw-r--r-- | win32/signal.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/win32/signal.h b/win32/signal.h index 8d4f411d21..ec739527ac 100644 --- a/win32/signal.h +++ b/win32/signal.h @@ -1,23 +1,8 @@ #ifndef PHP_WIN32_SIGNAL_H #define PHP_WIN32_SIGNAL_H -#if _MSC_VER >= 1900 #include <signal.h> -#else -/* -** Change here: if you plan to use your own version of <signal.h> -** the original "#include <signal.h>" produces an infinite reinclusion -** of this file, instead of including the standard include-file. -** Under MS Visual Studio, there are occurrences in the source where -** <signal.h> gets included throughout the PHP sources, and this should -** include THIS file, not the standard one which does not have the -** additional signals defined below. -** One way to remove the infinite reinclusion of this file (which is located -** in ../win32), is to specify the parent directory in which the standard -** include file is located. -*/ -#include <../include/signal.h> -#endif + #define SIGALRM 13 #define SIGVTALRM 26 /* virtual time alarm */ #define SIGPROF 27 /* profiling time alarm */ |