diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 13:56:26 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 13:56:26 +0000 |
| commit | 07eb7bec1f2c2d440fc87d89c09681e5b6939f94 (patch) | |
| tree | 9807c370b073b8f332d9366b552aad073324d752 /auto | |
| parent | 4332c96e3853fb0c3eaa3b9e7a3df1a61618056e (diff) | |
| download | nginx-07eb7bec1f2c2d440fc87d89c09681e5b6939f94.tar.gz nginx-07eb7bec1f2c2d440fc87d89c09681e5b6939f94.tar.bz2 | |
Merging r4155, r4219, r4220, r4230:
Windows related fixes:
*) Fixed segmentation fault with empty config on Windows.
See here for report:
http://mailman.nginx.org/pipermail/nginx-ru/2011-September/043288.html
*) Recent SDKs allow to build IPV6 only for Windows XP or above.
*) Fixing conflict with SDK off_t definition.
*) Fix of building by Microsoft Visual C++ 10 compiler.
Diffstat (limited to '')
| -rw-r--r-- | auto/cc/name | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/auto/cc/name b/auto/cc/name index d197fc59b..8788bc662 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -25,6 +25,13 @@ fi if [ "$CC" = cl ]; then if `$NGX_WINE $CC -v 2>&1 \ + | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16' \ + >/dev/null 2>&1`; then + + NGX_CC_NAME=msvc10 + echo " + using Microsoft Visual C++ 10 compiler" + + else if `$NGX_WINE $CC -v 2>&1 \ | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \ >/dev/null 2>&1`; then @@ -43,6 +50,7 @@ if [ "$CC" = cl ]; then echo " + using Microsoft Visual C++ compiler" fi fi + fi else if [ "$CC" = wcl386 ]; then |