Commit 23518374 authored by paroga@webkit.org's avatar paroga@webkit.org

2011-03-27 Patrick Gansterer <paroga@webkit.org>

        Reviewed by Andreas Kling.

        Fix agentOS() in FrameLoaderClientEfl
        https://bugs.webkit.org/show_bug.cgi?id=57177

        Replace old PLATFORM macro with OS and CPU.

        * WebCoreSupport/FrameLoaderClientEfl.cpp:
        (WebCore::agentOS):

git-svn-id: svn://svn.chromium.org/blink/trunk@82072 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 9cac6566
2011-03-27 Patrick Gansterer <paroga@webkit.org>
Reviewed by Andreas Kling.
Fix agentOS() in FrameLoaderClientEfl
https://bugs.webkit.org/show_bug.cgi?id=57177
Replace old PLATFORM macro with OS and CPU.
* WebCoreSupport/FrameLoaderClientEfl.cpp:
(WebCore::agentOS):
2011-03-27 Patrick Gansterer <paroga@webkit.org> 2011-03-27 Patrick Gansterer <paroga@webkit.org>
Reviewed by Andreas Kling. Reviewed by Andreas Kling.
......
...@@ -56,8 +56,10 @@ ...@@ -56,8 +56,10 @@
#include <wtf/text/CString.h> #include <wtf/text/CString.h>
#include <wtf/text/StringConcatenate.h> #include <wtf/text/StringConcatenate.h>
#if PLATFORM(UNIX) #if OS(UNIX)
#include <sys/utsname.h> #include <sys/utsname.h>
#elif OS(WINDOWS)
#include "SystemInfo.h"
#endif #endif
#include <Ecore_Evas.h> #include <Ecore_Evas.h>
...@@ -78,21 +80,20 @@ FrameLoaderClientEfl::FrameLoaderClientEfl(Evas_Object *view) ...@@ -78,21 +80,20 @@ FrameLoaderClientEfl::FrameLoaderClientEfl(Evas_Object *view)
static String agentOS() static String agentOS()
{ {
#if PLATFORM(DARWIN) #if OS(DARWIN)
#if PLATFORM(X86) #if CPU(X86)
return "Intel Mac OS X"; return "Intel Mac OS X";
#else #else
return "PPC Mac OS X"; return "PPC Mac OS X";
#endif #endif
#elif PLATFORM(UNIX) #elif OS(UNIX)
struct utsname name; struct utsname name;
if (uname(&name) != -1) if (uname(&name) != -1)
return makeString(name.sysname, ' ', name.machine); return makeString(name.sysname, ' ', name.machine);
return "Unknown"; return "Unknown";
#elif PLATFORM(WIN_OS) #elif OS(WINDOWS)
// FIXME: Compute the Windows version return windowsVersionForUAString();
return "Windows";
#else #else
notImplemented(); notImplemented();
return "Unknown"; return "Unknown";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment