generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-21 06:37:42 +01:00
Code Issues Projects Releases Wiki Activity

GH #59: Poco::Environment::osDisplayName()

Browse Source 
GH #59: Poco::Environment::osDisplayName() not recognized Windows
8/Server 2012
This commit is contained in:
Aleksandar Fabijanic 2013-03-24 14:47:55 -05:00
parent 22b658a838
commit 4668c13af7
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -34,6 +34,7 @@ Release 1.5.2 (2013-03-??)
- fixed GH #131: no timezone global var on OpenBSD
- fixed GH #102: Some subprojects don't have x64 solutions for VS 2010
- added GH #75: Poco::Uri addQueryParameter method
- Poco::Environment::osDisplayName() now recognized Windows 8/Server 2012
Release 1.5.1 (2013-01-11)
==========================

2
Foundation/include/Poco/Environment.h
View File

@ -81,7 +81,7 @@ public:
/// Currently this is only implemented for
/// Windows. There it will return names like
/// "Windows XP" or "Windows 7/Server 2008 SP2".
/// On other platform, returns the same as
/// On other platforms, returns the same as
/// osName().
static std::string osVersion();

4
Foundation/src/Environment_WIN32.cpp
View File

@ -107,7 +107,9 @@ std::string EnvironmentImpl::osDisplayNameImpl()
case 0:
return "Windows Vista/Server 2008";
case 1:
return "Windows 7/Server 2008 SP2";
return "Windows 7/Server 2008 R2";
case 2:
return "Windows 8/Server 2012";
default:
return "Unknown";
}

4
Foundation/src/Environment_WIN32U.cpp
View File

@ -117,7 +117,9 @@ std::string EnvironmentImpl::osDisplayNameImpl()
case 0:
return "Windows Vista/Server 2008";
case 1:
return "Windows 7/Server 2008 SP2";
return "Windows 7/Server 2008 R2";
case 2:
return "Windows 8/Server 2012";
default:
return "Unknown";
}

5
build/config/Darwin-clang
View File

@ -20,6 +20,9 @@ POCO_TARGET_OSARCH ?= x86_64
POCO_HOST_OSARCH := $(POCO_TARGET_OSARCH)
ARCHFLAGS ?= -arch $(POCO_TARGET_OSARCH)
ifeq ($(POCO_TARGET_OSARCH),i386)
RORELOCS = -read_only_relocs suppress
endif
#
# Tools
@ -30,7 +33,7 @@ LINK = $(CXX) -bind_at_load
LIB = libtool -static -o
RANLIB = ranlib
SHLIB = $(CXX) -dynamiclib -o $@
DYLIB = $(CXX) -dynamic -bundle -read_only_relocs suppress -Wl,-bind_at_load -o $@
DYLIB = $(CXX) -dynamic -bundle $(RORELOCS) suppress -Wl,-bind_at_load -o $@
SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP =
DEP = $(POCO_BASE)/build/script/makedepend.clang