Title: [174108] trunk/Source/_javascript_Core
- Revision
- 174108
- Author
- oli...@apple.com
- Date
- 2014-09-30 10:27:10 -0700 (Tue, 30 Sep 2014)
Log Message
Fix C API header
https://bugs.webkit.org/show_bug.cgi?id=137254
<rdar://problem/18487528>
Build fix
Guard extern "C" behind __cplusplus ifdef
* API/JSBase.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/API/JSBase.h (174107 => 174108)
--- trunk/Source/_javascript_Core/API/JSBase.h 2014-09-30 15:19:16 UTC (rev 174107)
+++ trunk/Source/_javascript_Core/API/JSBase.h 2014-09-30 17:27:10 UTC (rev 174108)
@@ -37,12 +37,18 @@
#if __has_include(<Foundation/NSMapTablePriv.h>)
#import <Foundation/NSMapTablePriv.h>
#else
+
+#ifndef __cplusplus
extern "C" {
+#endif
void *NSMapGet(NSMapTable *, const void *key);
void NSMapInsert(NSMapTable *, const void *key, const void *value);
void NSMapRemove(NSMapTable *, const void *key);
+
+#ifndef __cplusplus
}
#endif
+#endif
#endif // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
#endif // __OBJC__
Modified: trunk/Source/_javascript_Core/ChangeLog (174107 => 174108)
--- trunk/Source/_javascript_Core/ChangeLog 2014-09-30 15:19:16 UTC (rev 174107)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-09-30 17:27:10 UTC (rev 174108)
@@ -1,3 +1,15 @@
+2014-09-30 Oliver Hunt <oli...@apple.com>
+
+ Fix C API header
+ https://bugs.webkit.org/show_bug.cgi?id=137254
+ <rdar://problem/18487528>
+
+ Build fix
+
+ Guard extern "C" behind __cplusplus ifdef
+
+ * API/JSBase.h:
+
2014-09-29 Brian J. Burg <b...@cs.washington.edu>
Web Inspector: InjectedScripts should not be profiled or displayed in Timeline
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
