Changeset 69112 in webkit


Ignore:
Timestamp:
Oct 5, 2010 8:53:45 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-10-05 Kristian Monsen <kristianm@google.com>

Reviewed by Steve Block.

Including JavaScriptCore/config.h from WebCore/config.h
instead of from WebCorePrefix.h.
https://bugs.webkit.org/show_bug.cgi?id=47179

No new tests, just changing where files are included.

  • WebCorePrefix.h:
  • config.h:
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r69111 r69112  
     12010-10-05  Kristian Monsen  <kristianm@google.com>
     2
     3        Reviewed by Steve Block.
     4
     5        Including JavaScriptCore/config.h from WebCore/config.h
     6        instead of from WebCorePrefix.h.
     7        https://bugs.webkit.org/show_bug.cgi?id=47179
     8
     9        No new tests, just changing where files are included.
     10
     11        * WebCorePrefix.h:
     12        * config.h:
     13
    1142010-10-05  Jakob Petsovits  <jpetsovits@rim.com>
    215
  • trunk/WebCore/WebCorePrefix.h

    r63717 r69112  
    7171#define EXPORT __attribute__((visibility("default")))
    7272#endif
    73 // Android uses a single set of include directories when building WebKit and
    74 // JavaScriptCore. Since WebCore/ is included before JavaScriptCore/, Android
    75 // includes JavaScriptCore/config.h explicitly here to make sure it gets picked
    76 // up.
    77 #include <JavaScriptCore/config.h>
    7873#endif
    7974
  • trunk/WebCore/config.h

    r67323 r69112  
    8181
    8282#if PLATFORM(ANDROID)
     83// Android uses a single set of include directories when building WebKit and
     84// JavaScriptCore. Since WebCore/ is included before JavaScriptCore/, Android
     85// includes JavaScriptCore/config.h explicitly here to make sure it gets picked
     86// up.
     87#include <JavaScriptCore/config.h>
     88
    8389#define WEBCORE_NAVIGATOR_VENDOR "Google Inc."
    8490// This must be defined before we include FastMalloc.h, below.
Note: See TracChangeset for help on using the changeset viewer.