Changeset 28911 in webkit for trunk/JavaScriptCore/JavaScriptCore.xcodeproj

Timestamp:

Dec 20, 2007, 2:17:42 PM (17 years ago)

Author:

[email protected]

Message:

2007-12-20 Rodney Dawes <​[email protected]>

Reviewed by Darin Adler.

Proxy includes of npruntime.h or npapi.h through npruntime_internal.h
Include stdio.h in npapi.h for the use of FILE with XP_UNIX defined
This is for building with X11, as some type and enum names conflict
with #define names in X11 headers.
​http://bugs.webkit.org/show_bug.cgi?id=15669

• JavaScriptCore.xcodeproj/project.pbxproj:
• bindings/NP_jsobject.h:
• bindings/npapi.h:
• bindings/npruntime.cpp:
• bindings/npruntime_impl.h:
• bindings/npruntime_priv.h:
• bindings/npruntime_internal.h:
• bindings/testbindings.cpp:
• bindings/c/c_class.h:
• bindings/c/c_runtime.h:
• bindings/c/c_utility.h:

2007-12-20 Rodney Dawes <​[email protected]>

Reviewed by Darin Adler.

Define XP_UNIX when building with plugins on X11.
Use new npruntime_internal.h instead of npruntime.h.
​http://bugs.webkit.org/show_bug.cgi?id=15669

• ForwardingHeaders/bindings/npruntime_internal.h
• WebCore.pro:
• html/HTMLPlugInElement.h:

File:

• trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (9 diffs)

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -89 +89 @@
                 51F648D70BB4E2CA0033D760 /* RetainPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F648D60BB4E2CA0033D760 /* RetainPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 5DA479660CFBCF56009328A0 /* TCPackedCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA479650CFBCF56009328A0 /* TCPackedCache.h */; };
+                5DAF21B00D1B1ED60000B392 /* npruntime_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DAF21AF0D1B1ED60000B392 /* npruntime_internal.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 5DBD18AC0C54018700C15EAE /* CollectorHeapIntrospector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DBD18AA0C54018700C15EAE /* CollectorHeapIntrospector.h */; };
                 5DBD18B00C5401A700C15EAE /* MallocZoneSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */; };
@@ -496 +497 @@
                 51F648D60BB4E2CA0033D760 /* RetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RetainPtr.h; sourceTree = "<group>"; };
                 5DA479650CFBCF56009328A0 /* TCPackedCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TCPackedCache.h; sourceTree = "<group>"; };
+                5DAF21AF0D1B1ED60000B392 /* npruntime_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = npruntime_internal.h; path = bindings/npruntime_internal.h; sourceTree = "<group>"; };
                 5DBD18A90C54018700C15EAE /* CollectorHeapIntrospector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CollectorHeapIntrospector.cpp; sourceTree = "<group>"; };
                 5DBD18AA0C54018700C15EAE /* CollectorHeapIntrospector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectorHeapIntrospector.h; sourceTree = "<group>"; };
@@ -835 +837 @@
                         isa = PBXGroup;
                         children = (
+                                5DAF21AF0D1B1ED60000B392 /* npruntime_internal.h */,
                                 5182A53A06012C3000CBD2F2 /* c_class.cpp */,
                                 5182A53B06012C3000CBD2F2 /* c_class.h */,
@@ -1175 +1178 @@
                                 14ABB455099C2A0F00E2A24F /* JSType.h in Headers */,
                                 1482B6EB0A4300B300517CFC /* JSValueRef.h in Headers */,
+                                14F252570D08DD8D004ECFFF /* JSVariableObject.h in Headers */,
                                 65C7A1740A8EAACB00FA37EA /* JSWrapperObject.h in Headers */,
                                 14BD5A360A3E91F600BAF59C /* JavaScriptCore.h in Headers */,
@@ -1192 +1196 @@
                                 65D6D87F09B5A32E0002E4D7 /* Platform.h in Headers */,
                                 65400C120A69BAF200509887 /* PropertyNameArray.h in Headers */,
+                                1419D32D0CEA7CDE00FF507A /* RefCounted.h in Headers */,
                                 65C647B4093EF8D60022C380 /* RefPtr.h in Headers */,
+                                148A1ECE0D10C23B0069A47C /* RefPtrHashMap.h in Headers */,
                                 51F648D70BB4E2CA0033D760 /* RetainPtr.h in Headers */,
                                 14BD534C0A3E0AEA00BAF59C /* SavedBuiltins.h in Headers */,
                                 E11D51760B2E798D0056C188 /* StringExtras.h in Headers */,
                                 14A396A70CD2933100B5B4FF /* SymbolTable.h in Headers */,
+                                5DA479660CFBCF56009328A0 /* TCPackedCache.h in Headers */,
                                 6541BD7208E80A17002CBEE7 /* TCPageMap.h in Headers */,
                                 6541BD7308E80A17002CBEE7 /* TCSpinLock.h in Headers */,
                                 6541BD7508E80A17002CBEE7 /* TCSystemAlloc.h in Headers */,
+                                E1EF79AB0CE97BA60088D500 /* UTF8.h in Headers */,
                                 E195679809E7CF1200B89D13 /* Unicode.h in Headers */,
                                 E195679609E7CF1200B89D13 /* UnicodeIcu.h in Headers */,
@@ -1244 +1252 @@
                                 932F5B850822A1C700736975 /* npruntime.h in Headers */,
                                 932F5B8E0822A1C700736975 /* npruntime_impl.h in Headers */,
+                                5DAF21B00D1B1ED60000B392 /* npruntime_internal.h in Headers */,
                                 932F5B8D0822A1C700736975 /* npruntime_priv.h in Headers */,
                                 932F5B510822A1C700736975 /* number_object.h in Headers */,
@@ -1275 +1284 @@
                                 932F5B5C0822A1C700736975 /* ustring.h in Headers */,
                                 14ABB36F099C076400E2A24F /* value.h in Headers */,
-                                E1EF79AB0CE97BA60088D500 /* UTF8.h in Headers */,
-                                1419D32D0CEA7CDE00FF507A /* RefCounted.h in Headers */,
-                                5DA479660CFBCF56009328A0 /* TCPackedCache.h in Headers */,
-                                14F252570D08DD8D004ECFFF /* JSVariableObject.h in Headers */,
-                                148A1ECE0D10C23B0069A47C /* RefPtrHashMap.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1536 +1540 @@
                                 1440FCE40A51E46B0005F061 /* JSClassRef.cpp in Sources */,
                                 14BD5A300A3E91F600BAF59C /* JSContextRef.cpp in Sources */,
+                                14DE0D690D02431400AACCA2 /* JSGlobalObject.cpp in Sources */,
                                 1482B7E40A43076000517CFC /* JSObjectRef.cpp in Sources */,
                                 1482B74E0A43032800517CFC /* JSStringRef.cpp in Sources */,
                                 146AAB380B66A94400E55F16 /* JSStringRefCF.cpp in Sources */,
                                 14BD5A320A3E91F600BAF59C /* JSValueRef.cpp in Sources */,
+                                14F252610D08DF2F004ECFFF /* JSVariableObject.cpp in Sources */,
                                 932F5BC60822A1C700736975 /* NP_jsobject.cpp in Sources */,
+                                E1EF79AA0CE97BA60088D500 /* UTF8.cpp in Sources */,
                                 932F5BCA0822A1C700736975 /* c_class.cpp in Sources */,
                                 932F5BC70822A1C700736975 /* c_instance.cpp in Sources */,
@@ -1567 +1574 @@
                                 932F5BBA0822A1C700736975 /* runtime_object.cpp in Sources */,
                                 932F5BC50822A1C700736975 /* runtime_root.cpp in Sources */,
-                                E1EF79AA0CE97BA60088D500 /* UTF8.cpp in Sources */,
-                                14DE0D690D02431400AACCA2 /* JSGlobalObject.cpp in Sources */,
-                                14F252610D08DF2F004ECFFF /* JSVariableObject.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;