|
From: <jt...@us...> - 2010-10-24 07:57:21
|
Revision: 7348
http://winmerge.svn.sourceforge.net/winmerge/?rev=7348&view=rev
Author: jtuc
Date: 2010-10-24 07:57:15 +0000 (Sun, 24 Oct 2010)
Log Message:
-----------
Possibly fix a possible 64 bit issue. (Unfortunately I have no way to test this.)
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/dllpstub.h
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2010-10-23 15:04:07 UTC (rev 7347)
+++ trunk/Src/7zCommon.cpp 2010-10-24 07:57:15 UTC (rev 7348)
@@ -735,7 +735,7 @@
*/
Merge7z::Proxy Merge7z =
{
- 0, 0, DllBuild_Merge7z,
+ { 0, 0, DllBuild_Merge7z },
"Merge7z%u%02u"DECORATE_U".dll",
"Merge7z"
};
Modified: trunk/Src/dllpstub.h
===================================================================
--- trunk/Src/dllpstub.h 2010-10-23 15:04:07 UTC (rev 7347)
+++ trunk/Src/dllpstub.h 2010-10-24 07:57:15 UTC (rev 7348)
@@ -36,6 +36,7 @@
DWORD dwMajorVersion; // Major version
DWORD dwMinorVersion; // Minor version
DWORD dwBuildNumber; // Build number
+ DWORD dwPadding; // Pad to 64 bit boundary
static void Throw(LPCSTR name, HMODULE, DWORD dwError, BOOL bFreeLibrary);
HMODULE Load();
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
