Index: Source/core/page/NavigatorID.cpp |
diff --git a/Source/core/page/NavigatorID.cpp b/Source/core/page/NavigatorID.cpp |
index 593d59ed532cd4433398c1f45d97600182fa6ec5..6f60f5d061006f5c2b3dcb0a5b4b94faf336b3fe 100644 |
--- a/Source/core/page/NavigatorID.cpp |
+++ b/Source/core/page/NavigatorID.cpp |
@@ -36,22 +36,10 @@ |
#include "wtf/CPU.h" |
#if OS(LINUX) |
-#include "sys/utsname.h" |
#include "wtf/StdLibExtras.h" |
+#include <sys/utsname.h> |
#endif |
-#ifndef WEBCORE_NAVIGATOR_PLATFORM |
-#if OS(DARWIN) && (CPU(PPC) || CPU(PPC64)) |
-#define WEBCORE_NAVIGATOR_PLATFORM "MacPPC" |
-#elif OS(DARWIN) && (CPU(X86) || CPU(X86_64)) |
-#define WEBCORE_NAVIGATOR_PLATFORM "MacIntel" |
-#elif OS(WINDOWS) |
-#define WEBCORE_NAVIGATOR_PLATFORM "Win32" |
-#else |
-#define WEBCORE_NAVIGATOR_PLATFORM "" |
-#endif |
-#endif // ifndef WEBCORE_NAVIGATOR_PLATFORM |
- |
namespace WebCore { |
String NavigatorID::appName(const NavigatorBase*) |
@@ -73,14 +61,16 @@ String NavigatorID::userAgent(const NavigatorBase* navigator) |
String NavigatorID::platform(const NavigatorBase*) |
{ |
+#if defined(WEBCORE_NAVIGATOR_PLATFORM) |
+ return WEBCORE_NAVIGATOR_PLATFORM; |
+#else |
#if OS(LINUX) |
- if (!String(WEBCORE_NAVIGATOR_PLATFORM).isEmpty()) |
- return WEBCORE_NAVIGATOR_PLATFORM; |
struct utsname osname; |
DEFINE_STATIC_LOCAL(String, platformName, (uname(&osname) >= 0 ? String(osname.sysname) + String(" ") + String(osname.machine) : emptyString())); |
return platformName; |
#else |
- return WEBCORE_NAVIGATOR_PLATFORM; |
+#error Non-Linux ports must define WEBCORE_NAVIGATOR_PLATFORM. |
+#endif |
#endif |
} |