From ab68a840dc2967a3d1bbf33d0f3d3eead73d2907 Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Sat, 27 Sep 2014 22:56:18 +0800 Subject: [PATCH] Mark g_IndexFileMap extern Signed-off-by: Sup Yut Sum --- src/Git/GitStatus.cpp | 2 +- src/TGitCache/TGITCache.cpp | 2 ++ src/TortoiseProc/TortoiseProc.cpp | 2 ++ src/TortoiseShell/TortoiseGIT.cpp | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Git/GitStatus.cpp b/src/Git/GitStatus.cpp index 8561d2d58..205610875 100644 --- a/src/Git/GitStatus.cpp +++ b/src/Git/GitStatus.cpp @@ -27,7 +27,7 @@ #include "ShellCache.h" extern CGitAdminDirMap g_AdminDirMap; -CGitIndexFileMap g_IndexFileMap; +extern CGitIndexFileMap g_IndexFileMap; CGitHeadFileMap g_HeadFileMap; CGitIgnoreList g_IgnoreList; diff --git a/src/TGitCache/TGITCache.cpp b/src/TGitCache/TGITCache.cpp index ad048e78b..7cf07b5cc 100644 --- a/src/TGitCache/TGITCache.cpp +++ b/src/TGitCache/TGITCache.cpp @@ -34,6 +34,7 @@ #include "SmartHandle.h" #include "DllVersion.h" #include "CreateProcessHelper.h" +#include "gitindex.h" #ifndef GET_X_LPARAM #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) @@ -62,6 +63,7 @@ HWND hTrayWnd; TCHAR szCurrentCrawledPath[MAX_CRAWLEDPATHS][MAX_CRAWLEDPATHSLEN]; int nCurrentCrawledpathIndex = 0; CComAutoCriticalSection critSec; +CGitIndexFileMap g_IndexFileMap; volatile LONG nThreadCount = 0; diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp index a1f52bef9..3ab8d7979 100644 --- a/src/TortoiseProc/TortoiseProc.cpp +++ b/src/TortoiseProc/TortoiseProc.cpp @@ -41,6 +41,7 @@ #include "TaskbarUUID.h" #include "ProjectProperties.h" #include "HistoryCombo.h" +#include "gitindex.h" #include #define STRUCT_IOVEC_DEFINED @@ -93,6 +94,7 @@ CString g_sGroupingUUID; CString g_sGroupingIcon; bool g_bGroupingRemoveIcon = false; HWND hWndExplorer; +CGitIndexFileMap g_IndexFileMap; #if ENABLE_CRASHHANLDER CCrashReportTGit crasher(L"TortoiseGit " _T(APP_X64_STRING), TGIT_VERMAJOR, TGIT_VERMINOR, TGIT_VERMICRO, TGIT_VERBUILD, TGIT_VERDATE); diff --git a/src/TortoiseShell/TortoiseGIT.cpp b/src/TortoiseShell/TortoiseGIT.cpp index f2612edc3..01f502499 100644 --- a/src/TortoiseShell/TortoiseGIT.cpp +++ b/src/TortoiseShell/TortoiseGIT.cpp @@ -22,6 +22,7 @@ #include "Guids.h" #include "ShellExtClassFactory.h" #include "ShellObjects.h" +#include "gitindex.h" volatile LONG g_cRefThisDll = 0; ///< reference count of this DLL. HINSTANCE g_hmodThisDll = NULL; ///< handle to this DLL itself. @@ -48,6 +49,7 @@ CComCriticalSection g_csGlobalCOMGuard; LPCTSTR g_MenuIDString = _T("TortoiseGit"); ShellObjects g_shellObjects; +CGitIndexFileMap g_IndexFileMap; #pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") -- 2.11.4.GIT