Title: [160440] branches/safari-537.74-branch/Tools
- Revision
- 160440
- Author
- [email protected]
- Date
- 2013-12-11 09:53:29 -0800 (Wed, 11 Dec 2013)
Log Message
Merge 154368: <rdar://problem/15498872>.
Modified Paths
Diff
Modified: branches/safari-537.74-branch/Tools/ChangeLog (160439 => 160440)
--- branches/safari-537.74-branch/Tools/ChangeLog 2013-12-11 17:49:44 UTC (rev 160439)
+++ branches/safari-537.74-branch/Tools/ChangeLog 2013-12-11 17:53:29 UTC (rev 160440)
@@ -1,3 +1,16 @@
+2013-12-11 Matthew Hanson <[email protected]>
+
+ Merge 154368
+
+ 2013-08-20 Alex Christensen <[email protected]>
+
+ [Windows] Linking fix for Win64.
+
+ Rubberstamped by Brent Fulgham.
+
+ * win/DLLLauncher/DLLLauncherMain.cpp:
+ (wWinMain): Corrected 64-bit linker symbol for dllLauncherEntryPoint.
+
2013-12-11 Lucas Forschler <[email protected]>
Merge r159328
Modified: branches/safari-537.74-branch/Tools/win/DLLLauncher/DLLLauncherMain.cpp (160439 => 160440)
--- branches/safari-537.74-branch/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2013-12-11 17:49:44 UTC (rev 160439)
+++ branches/safari-537.74-branch/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2013-12-11 17:53:29 UTC (rev 160440)
@@ -188,14 +188,14 @@
#if USE_CONSOLE_ENTRY_POINT
typedef int (WINAPI*EntryPoint)(int, const char*[]);
#if defined _M_AMD64 || defined _WIN64
- const char* entryPointName = "_dllLauncherEntryPoint";
+ const char* entryPointName = "dllLauncherEntryPoint";
#else
const char* entryPointName = "_dllLauncherEntryPoint@8";
#endif
#else
typedef int (WINAPI*EntryPoint)(HINSTANCE, HINSTANCE, LPWSTR, int);
#if defined _M_AMD64 || defined _WIN64
- const char* entryPointName = "_dllLauncherEntryPoint";
+ const char* entryPointName = "dllLauncherEntryPoint";
#else
const char* entryPointName = "_dllLauncherEntryPoint@16";
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
