Title: [154368] trunk/Tools
- Revision
- 154368
- Author
- [email protected]
- Date
- 2013-08-20 15:32:47 -0700 (Tue, 20 Aug 2013)
Log Message
[Windows] Linking fix for Win64.
Rubberstamped by Brent Fulgham.
* win/DLLLauncher/DLLLauncherMain.cpp:
(wWinMain): Corrected 64-bit linker symbol for dllLauncherEntryPoint.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (154367 => 154368)
--- trunk/Tools/ChangeLog 2013-08-20 22:25:29 UTC (rev 154367)
+++ trunk/Tools/ChangeLog 2013-08-20 22:32:47 UTC (rev 154368)
@@ -1,3 +1,12 @@
+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-08-20 Brent Fulgham <[email protected]>
<https://webkit.org/b/120090> Report better error messages from WinLauncher/DRT
Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (154367 => 154368)
--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2013-08-20 22:25:29 UTC (rev 154367)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2013-08-20 22:32:47 UTC (rev 154368)
@@ -196,14 +196,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
