Fixed issue #113: (10) Push and push times out on WebDAV passwords

[tortoisegit/TortoiseGitJp.git] / src / TGitCache / CacheInterface.h

diff --git a/src/TGitCache/CacheInterface.h b/src/TGitCache/CacheInterface.h
index 2c20220..705e3d5 100644 (file)
--- a/src/TGitCache/CacheInterface.h
+++ b/src/TGitCache/CacheInterface.h
@@ -20,17 +20,18 @@
 #pragma once\r
 #include "wininet.h"\r
 \r
+#include "GitStatus.h"\r
 // The name of the named-pipe for the cache\r
 #ifdef WIN64\r
-#define TSVN_CACHE_PIPE_NAME _T("\\\\.\\pipe\\TSVNCache64")\r
-#define TSVN_CACHE_COMMANDPIPE_NAME _T("\\\\.\\pipe\\TSVNCacheCommand64")\r
-#define TSVN_CACHE_WINDOW_NAME _T("TSVNCacheWindow64")\r
-#define TSVN_CACHE_MUTEX_NAME _T("TSVNCacheMutex64")\r
+#define TSVN_CACHE_PIPE_NAME _T("\\\\.\\pipe\\TGitCache64")\r
+#define TSVN_CACHE_COMMANDPIPE_NAME _T("\\\\.\\pipe\\TGitCacheCommand64")\r
+#define TSVN_CACHE_WINDOW_NAME _T("TGitCacheWindow64")\r
+#define TSVN_CACHE_MUTEX_NAME _T("TGitCacheMutex64")\r
 #else\r
-#define TSVN_CACHE_PIPE_NAME _T("\\\\.\\pipe\\TSVNCache")\r
-#define TSVN_CACHE_COMMANDPIPE_NAME _T("\\\\.\\pipe\\TSVNCacheCommand")\r
-#define TSVN_CACHE_WINDOW_NAME _T("TSVNCacheWindow")\r
-#define TSVN_CACHE_MUTEX_NAME _T("TSVNCacheMutex")\r
+#define TSVN_CACHE_PIPE_NAME _T("\\\\.\\pipe\\TGitCache")\r
+#define TSVN_CACHE_COMMANDPIPE_NAME _T("\\\\.\\pipe\\TGitCacheCommand")\r
+#define TSVN_CACHE_WINDOW_NAME _T("TGitCacheWindow")\r
+#define TSVN_CACHE_MUTEX_NAME _T("TGitCacheMutex")\r
 #endif\r
 \r
 CString GetCachePipeName();\r
@@ -39,6 +40,17 @@ CString GetCacheMutexName();
 \r
 CString GetCacheID();\r
 \r
+\r
+typedef enum git_node_kind_t\r
+{\r
+       git_node_none,\r
+       git_node_file,\r
+       git_node_dir,\r
+       git_node_unknown,\r
+\r
+}git_node_kind;\r
+\r
+\r
 /**\r
  * \ingroup TSVNCache\r
  * A structure passed as a request from the shell (or other client) to the external cache\r
@@ -51,7 +63,7 @@ struct TSVNCacheRequest
 \r
 // CustomActions will use this header but does not need nor understand the SVN types ...\r
 \r
-#ifdef SVN_WC_H\r
+//#ifdef SVN_WC_H\r
 \r
 /**\r
  * \ingroup TSVNCache\r
@@ -59,9 +71,9 @@ struct TSVNCacheRequest
  */\r
 struct TSVNCacheResponse\r
 {\r
-       svn_wc_status2_t m_status;\r
-       svn_wc_entry_t m_entry;\r
-       svn_node_kind_t m_kind;\r
+       git_wc_status2_t m_status;\r
+       git_wc_entry_t m_entry;\r
+       git_node_kind_t m_kind;\r
        char m_url[INTERNET_MAX_URL_LENGTH+1];\r
        char m_owner[255];              ///< owner of the lock\r
        char m_author[255];\r
@@ -69,7 +81,7 @@ struct TSVNCacheResponse
        bool m_needslock;               ///< whether the file has the svn:needs-lock property set or not (only works with the new working copy version)\r
 };\r
 \r
-#endif // SVN_WC_H\r
+//#endif // SVN_WC_H\r
 \r
 /**\r
  * \ingroup TSVNCache\r