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

GH #59: Poco::Environment::osDisplayName() not recognized Windows 8/Server 2012
pocoproject · Mar 24, 2013 · 4668c13 · 4668c13
1 parent 22b658a
commit 4668c13
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -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)
 ==========================

diff --git a/Foundation/include/Poco/Environment.h b/Foundation/include/Poco/Environment.h
@@ -81,7 +81,7 @@ class Foundation_API Environment
 		/// 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();

diff --git a/Foundation/src/Environment_WIN32.cpp b/Foundation/src/Environment_WIN32.cpp
@@ -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";
 		}

diff --git a/Foundation/src/Environment_WIN32U.cpp b/Foundation/src/Environment_WIN32U.cpp
@@ -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";
 		}

diff --git a/build/config/Darwin-clang b/build/config/Darwin-clang
@@ -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