Title: [249682] trunk/Source/WebKitLegacy/win
- Revision
- 249682
- Author
- [email protected]
- Date
- 2019-09-09 18:28:57 -0700 (Mon, 09 Sep 2019)
Log Message
[Win][WebKitLegacy] WebKitDLL.h(53,37): warning: 'gClassNameCount' has C-linkage specified, but returns user-defined type 'HashCountedSet<WTF::String> &' which is incompatible with C [-Wreturn-type-c-linkage]
https://bugs.webkit.org/show_bug.cgi?id=201601
Reviewed by Ross Kirsling.
Fixed a clang-cl warning. Names which aren't dllexport-ed don't
need to be in a extern "C" scope because they aren't exported to
other DLLs.
* WebKitDLL.h: Moved some variables and gClassNameCount() out of extern "C" scope.
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (249681 => 249682)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2019-09-10 01:01:45 UTC (rev 249681)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2019-09-10 01:28:57 UTC (rev 249682)
@@ -1,3 +1,16 @@
+2019-09-09 Fujii Hironori <[email protected]>
+
+ [Win][WebKitLegacy] WebKitDLL.h(53,37): warning: 'gClassNameCount' has C-linkage specified, but returns user-defined type 'HashCountedSet<WTF::String> &' which is incompatible with C [-Wreturn-type-c-linkage]
+ https://bugs.webkit.org/show_bug.cgi?id=201601
+
+ Reviewed by Ross Kirsling.
+
+ Fixed a clang-cl warning. Names which aren't dllexport-ed don't
+ need to be in a extern "C" scope because they aren't exported to
+ other DLLs.
+
+ * WebKitDLL.h: Moved some variables and gClassNameCount() out of extern "C" scope.
+
2019-09-06 Alex Christensen <[email protected]>
When disabling legacy private browsing for testing, change the SessionID back to what it was, not the defaultSessionID
Modified: trunk/Source/WebKitLegacy/win/WebKitDLL.h (249681 => 249682)
--- trunk/Source/WebKitLegacy/win/WebKitDLL.h 2019-09-10 01:01:45 UTC (rev 249681)
+++ trunk/Source/WebKitLegacy/win/WebKitDLL.h 2019-09-10 01:28:57 UTC (rev 249682)
@@ -36,6 +36,12 @@
#include <wtf/text/StringHash.h>
#include <wtf/text/WTFString.h>
+extern ULONG gLockCount;
+extern ULONG gClassCount;
+extern HashCountedSet<WTF::String>& gClassNameCount();
+extern HINSTANCE gInstance;
+extern CLSID gRegCLSIDs[];
+
#ifndef WEBKIT_API
#ifdef WEBKIT_EXPORTS
#define WEBKIT_API __declspec(dllexport)
@@ -48,12 +54,6 @@
extern "C" {
#endif
-extern ULONG gLockCount;
-extern ULONG gClassCount;
-extern HashCountedSet<WTF::String>& gClassNameCount();
-extern HINSTANCE gInstance;
-extern CLSID gRegCLSIDs[];
-
WEBKIT_API void shutDownWebKit();
#ifdef __cplusplus
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
