com php-src: add windows 8 and windows server 2012: ext/standard/info.c
| From: | Pierre Joye | Date: | Wed, 27 Mar 2013 06:29:47 +0000 |
| Subject: | com php-src: add windows 8 and windows server 2012: ext/standard/info.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71759@lists.php.net to get a copy of this message | ||
Commit: f01a7e54d3d3ab82e7739b1e43a21179297208f6
Author: Pierre Joye <pierre.php@gmail.com> Wed, 27 Mar 2013 07:29:47 +0100
Parents: d0aa831614aafc2ae4975a0dc1e92ab97651d818
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f01a7e54d3d3ab82e7739b1e43a21179297208f6
Log:
add windows 8 and windows server 2012
Changed paths:
M ext/standard/info.c
Diff:
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 20e6b0c..e8ba908 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -316,7 +316,7 @@ char* php_get_windows_name()
}
if (VER_PLATFORM_WIN32_NT==osvi.dwPlatformId && osvi.dwMajorVersion > 4 ) {
- if (osvi.dwMajorVersion == 6) {
+ if (osvi.dwMajorVersion == 6) {
if( osvi.dwMinorVersion == 0 ) {
if( osvi.wProductType == VER_NT_WORKSTATION ) {
major = "Windows Vista";
@@ -330,6 +330,12 @@ char* php_get_windows_name()
} else {
major = "Windows Server 2008 R2";
}
+ } else if ( osvi.dwMinorVersion == 2 ) {
+ if( osvi.wProductType == VER_NT_WORKSTATION ) {
+ major = "Windows 8";
+ } else {
+ major = "Windows Server 2012";
+ }
} else {
major = "Unknown Windows version";
}