Changeset 80784 in webkit


Ignore:
Timestamp:
Mar 10, 2011 4:17:12 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-03-10 Oleg Romashin <​romaxa@gmail.com>

Reviewed by Andreas Kling.

Make Qt port compiling with ENABLE_PLUGIN_PROCESS=1, part3
Solving conflict of Qt and Xlib includes

  • Shared/Plugins/NPIdentifierData.cpp:
  • Shared/Plugins/NPIdentifierData.h:
  • Shared/Plugins/NPObjectProxy.cpp:
  • Shared/Plugins/NPVariantData.h:
Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r80765 r80784  
     12011-03-10  Oleg Romashin  <romaxa@gmail.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        Make Qt port compiling with ENABLE_PLUGIN_PROCESS=1, part3
     6        Solving conflict of Qt and Xlib includes
     7
     8        * Shared/Plugins/NPIdentifierData.cpp:
     9        * Shared/Plugins/NPIdentifierData.h:
     10        * Shared/Plugins/NPObjectProxy.cpp:
     11        * Shared/Plugins/NPVariantData.h:
     12
    1132011-03-10  Sam Weinig  <sam@webkit.org>
    214

  • trunk/Source/WebKit2/Shared/Plugins/NPIdentifierData.h

    r71127 r80784  
    2929#if ENABLE(PLUGIN_PROCESS)
    3030
    31 #include <WebCore/npruntime.h>
     31#include <WebCore/npruntime_internal.h>
    3232#include <wtf/text/CString.h>
    3333

  • trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.h

    r71559 r80784  
    2929#if ENABLE(PLUGIN_PROCESS)
    3030
    31 #include <WebCore/npruntime.h>
     31#include <WebCore/npruntime_internal.h>
    3232#include <wtf/Noncopyable.h>
    3333
Note: See TracChangeset for help on using the changeset viewer.