mirror of
https://github.com/php/php-src.git
synced 2026-04-29 19:23:22 +02:00
Merge branch 'PHP-5.5'
* PHP-5.5: add windows 8 and windows server 2012
This commit is contained in:
+7
-1
@@ -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";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user