Title: [174133] tags/Safari-601.1.1.1/Source/_javascript_Core
- Revision
- 174133
- Author
- [email protected]
- Date
- 2014-09-30 16:15:29 -0700 (Tue, 30 Sep 2014)
Log Message
Merged r174108. <rdar://problem/18487528>
Modified Paths
Diff
Modified: tags/Safari-601.1.1.1/Source/_javascript_Core/API/JSBase.h (174132 => 174133)
--- tags/Safari-601.1.1.1/Source/_javascript_Core/API/JSBase.h 2014-09-30 23:03:38 UTC (rev 174132)
+++ tags/Safari-601.1.1.1/Source/_javascript_Core/API/JSBase.h 2014-09-30 23:15:29 UTC (rev 174133)
@@ -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: tags/Safari-601.1.1.1/Source/_javascript_Core/ChangeLog (174132 => 174133)
--- tags/Safari-601.1.1.1/Source/_javascript_Core/ChangeLog 2014-09-30 23:03:38 UTC (rev 174132)
+++ tags/Safari-601.1.1.1/Source/_javascript_Core/ChangeLog 2014-09-30 23:15:29 UTC (rev 174133)
@@ -1,3 +1,19 @@
+2014-09-30 Babak Shafiei <[email protected]>
+
+ Merge r174108. <rdar://problem/18487528>
+
+ 2014-09-30 Oliver Hunt <[email protected]>
+
+ 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-26 Babak Shafiei <[email protected]>
Roll out r172794. <rdar://problem/18447606>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
