• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision26859 (tree)
Zeit2015-10-04 21:02:53
Autorstefankueng

Log Message

Build a separate 32-bit version of the svn dll which is used only on x64 OS for the 32-bit apps file-open/save dialogs.

The dll is built to link statically against the CRT and the apr libs. Also all networking stuff is omitted since the shell extension doesn't need those - it keeps the dll small.

Ändern Zusammenfassung

Diff

--- trunk/src/SVN/SVNBase.cpp (revision 26858)
+++ trunk/src/SVN/SVNBase.cpp (revision 26859)
@@ -39,7 +39,9 @@
3939 #include "svn_client.h"
4040 #pragma warning(pop)
4141
42+#ifndef TSVN_STATICSHELL
4243 extern "C" void TSVN_ClearLastUsedAuthCache();
44+#endif
4345
4446 SVNBase::SVNBase()
4547 : Err(NULL)
@@ -258,6 +260,7 @@
258260
259261 void SVNBase::ClearCAPIAuthCacheOnError() const
260262 {
263+#ifndef TSVN_STATICSHELL
261264 if (Err != NULL)
262265 {
263266 if ( (SVN_ERROR_IN_CATEGORY(Err->apr_err, SVN_ERR_AUTHN_CATEGORY_START)) ||
@@ -266,6 +269,7 @@
266269 (Err->apr_err == SVN_ERR_RA_CANNOT_CREATE_SESSION))
267270 TSVN_ClearLastUsedAuthCache();
268271 }
272+#endif
269273 }
270274
271275 #endif
--- trunk/src/TortoiseShell/ShellExt.cpp (revision 26858)
+++ trunk/src/TortoiseShell/ShellExt.cpp (revision 26859)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2014 - TortoiseSVN
3+// Copyright (C) 2003-2015 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -92,8 +92,9 @@
9292 if (dirpointA)
9393 *dirpointA = 0;
9494 strcat_s(langdirA, "\\Languages");
95+#ifdef ENABLE_NLS
9596 bindtextdomain ("subversion", langdirA);
96-
97+#endif
9798 BOOL bIsWow = FALSE;
9899 IsWow64Process(GetCurrentProcess(), &bIsWow);
99100
Show on old repository browser