Reviewed by Darin.
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Jan 2008 20:37:03 +0000 (20:37 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Jan 2008 20:37:03 +0000 (20:37 +0000)
        Fix Mac build.

        * API/JSNode.c:
        * API/JSNode.h:
        * API/JSNodeList.c:
        * API/JSNodeList.h:
        * API/JavaScript.h:
        * API/JavaScriptCore.h:
        * API/minidom.c:
        * JavaScriptCore.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29238 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/API/JSNode.c
JavaScriptCore/API/JSNode.h
JavaScriptCore/API/JSNodeList.c
JavaScriptCore/API/JSNodeList.h
JavaScriptCore/API/JavaScript.h
JavaScriptCore/API/JavaScriptCore.h
JavaScriptCore/API/minidom.c
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

index e124e07..066c71d 100644 (file)
@@ -26,6 +26,9 @@
 
 #include "JSNode.h"
 #include "JSNodeList.h"
+#include "JSObjectRef.h"
+#include "JSStringRef.h"
+#include "JSValueRef.h"
 #include "Node.h"
 #include "NodeList.h"
 #include "UnusedParam.h"
index c3b80cc..cd3a441 100644 (file)
@@ -27,8 +27,9 @@
 #ifndef JSNode_h
 #define JSNode_h
 
-#include <JavaScriptCore/JavaScript.h>
+#include "JSBase.h"
 #include "Node.h"
+#include <stddef.h>
 
 extern JSObjectRef JSNode_new(JSContextRef context, Node* node);
 extern JSClassRef JSNode_class(JSContextRef context);
index b56e380..34d045e 100644 (file)
@@ -26,6 +26,8 @@
 
 #include "JSNode.h"
 #include "JSNodeList.h"
+#include "JSObjectRef.h"
+#include "JSValueRef.h"
 #include "UnusedParam.h"
 #include <wtf/Assertions.h>
 
index b96b4a8..0bc5f74 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef JSNodeList_h
 #define JSNodeList_h
 
-#include <JavaScriptCore/JavaScript.h>
+#include "JSBase.h"
 #include "NodeList.h"
 
 extern JSObjectRef JSNodeList_new(JSContextRef, NodeList*);
index c6d3f9b..3a6cc38 100644 (file)
@@ -1,5 +1,6 @@
 // -*- mode: c++; c-basic-offset: 4 -*-
 /*
+ * Copyright (C) 2006 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  *
  * Redistribution and use in source and binary forms, with or without
index 34169ec..be6b8b2 100644 (file)
@@ -1,6 +1,6 @@
 // -*- mode: c++; c-basic-offset: 4 -*-
 /*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
index 0702fd0..cfbaaa0 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "JSContextRef.h"
 #include "JSNode.h"
+#include "JSObjectRef.h"
+#include "JSStringRef.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <wtf/Assertions.h>
index b988e44..ad41316 100644 (file)
@@ -1,3 +1,18 @@
+2008-01-07  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+
+        Fix Mac build.
+
+        * API/JSNode.c:
+        * API/JSNode.h:
+        * API/JSNodeList.c:
+        * API/JSNodeList.h:
+        * API/JavaScript.h:
+        * API/JavaScriptCore.h:
+        * API/minidom.c:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+
 2008-01-07  Alp Toker  <alp@atoker.com>
 
         Reviewed by Darin.
index 621225d..fcf0e58 100644 (file)
                14BD5A300A3E91F600BAF59C /* JSContextRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14BD5A290A3E91F600BAF59C /* JSContextRef.cpp */; };
                14BD5A310A3E91F600BAF59C /* JSContextRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 14BD5A2A0A3E91F600BAF59C /* JSContextRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
                14BD5A320A3E91F600BAF59C /* JSValueRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14BD5A2B0A3E91F600BAF59C /* JSValueRef.cpp */; };
-               14BD5A360A3E91F600BAF59C /* JavaScript.h in Headers */ = {isa = PBXBuildFile; fileRef = 14BD5A2F0A3E91F600BAF59C /* JavaScript.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               14BD5A360A3E91F600BAF59C /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 14BD5A2F0A3E91F600BAF59C /* JavaScriptCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
                14DE0D690D02431400AACCA2 /* JSGlobalObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14DE0D680D02431400AACCA2 /* JSGlobalObject.cpp */; };
                14F252570D08DD8D004ECFFF /* JSVariableObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F252560D08DD8D004ECFFF /* JSVariableObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                14F252610D08DF2F004ECFFF /* JSVariableObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14F252600D08DF2F004ECFFF /* JSVariableObject.cpp */; };
+               1CAA8B4C0D32C39A0041BCFF /* JavaScript.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               1CAA8B4D0D32C39A0041BCFF /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1CAF34890A6C421700ABE06E /* WebScriptObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAF34880A6C421700ABE06E /* WebScriptObject.h */; };
                5186111E0CC824900081412B /* Deque.h in Headers */ = {isa = PBXBuildFile; fileRef = 5186111D0CC824830081412B /* Deque.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51F648D70BB4E2CA0033D760 /* RetainPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F648D60BB4E2CA0033D760 /* RetainPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                14BD5A2A0A3E91F600BAF59C /* JSContextRef.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSContextRef.h; sourceTree = "<group>"; };
                14BD5A2B0A3E91F600BAF59C /* JSValueRef.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSValueRef.cpp; sourceTree = "<group>"; };
                14BD5A2D0A3E91F600BAF59C /* testapi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = testapi.c; sourceTree = "<group>"; };
-               14BD5A2F0A3E91F600BAF59C /* JavaScript.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JavaScript.h; sourceTree = "<group>"; };
-               14BD5A2F0A3E91F600BAF59C /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = "<group>"; };
                14D857740A4696C80032146C /* testapi.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = testapi.js; sourceTree = "<group>"; };
                14DE0D680D02431400AACCA2 /* JSGlobalObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObject.cpp; sourceTree = "<group>"; };
                14F252560D08DD8D004ECFFF /* JSVariableObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSVariableObject.h; sourceTree = "<group>"; };
                1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = JavaScriptCore.xcconfig; sourceTree = "<group>"; };
                1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
                1C9051450BA9E8A70081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
+               1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScript.h; sourceTree = "<group>"; };
+               1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = "<group>"; };
                1CAF34880A6C421700ABE06E /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebScriptObject.h; path = bindings/objc/WebScriptObject.h; sourceTree = "<group>"; };
                45E12D8806A49B0F00E9DF84 /* testkjs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = testkjs.cpp; path = ../kjs/testkjs.cpp; sourceTree = "<group>"; tabWidth = 8; };
                5114F47B05E4426200D1BBBD /* runtime_root.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_root.cpp; path = bindings/runtime_root.cpp; sourceTree = "<group>"; tabWidth = 8; };
                1432EBD70A34CAD400717B9F /* API */ = {
                        isa = PBXGroup;
                        children = (
+                               1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */,
+                               1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */,
                                1482B78A0A4305AB00517CFC /* APICast.h */,
-                               14BD5A2F0A3E91F600BAF59C /* JavaScript.h */,
-                               14BD5A2F0A3E91F600BAF59C /* JavaScriptCore.h */,
                                1421359A0A677F4F00A8195E /* JSBase.cpp */,
                                142711380A460BBB0080EEEA /* JSBase.h */,
                                1440F8AD0A508D200005F061 /* JSCallbackConstructor.cpp */,
                                1482B6EB0A4300B300517CFC /* JSValueRef.h in Headers */,
                                14F252570D08DD8D004ECFFF /* JSVariableObject.h in Headers */,
                                65C7A1740A8EAACB00FA37EA /* JSWrapperObject.h in Headers */,
-                               14BD5A360A3E91F600BAF59C /* JavaScript.h in Headers */,
-                               14BD5A360A3E91F600BAF59C /* JavaScriptCore.h in Headers */,
                                932F5B610822A1C700736975 /* JavaScriptCorePrefix.h in Headers */,
                                65A7A5E00CD1D50E00061F8E /* LabelStack.h in Headers */,
                                657EB7460B708F540063461B /* ListHashSet.h in Headers */,
                                93E26BFE08B151D400F85226 /* ucpinternal.h in Headers */,
                                932F5B5C0822A1C700736975 /* ustring.h in Headers */,
                                14ABB36F099C076400E2A24F /* value.h in Headers */,
+                               1CAA8B4C0D32C39A0041BCFF /* JavaScript.h in Headers */,
+                               1CAA8B4D0D32C39A0041BCFF /* JavaScriptCore.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };