Fix error in call to GetTimeZoneInformation().

[tortoisegit/TortoiseGitJp.git] / src / Git / GitRev.cpp

diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp
index 9f06c61..5187484 100644 (file)
--- a/src/Git/GitRev.cpp
+++ b/src/Git/GitRev.cpp
@@ -2,6 +2,16 @@
 #include "GitRev.h"\r
 #include "Git.h"\r
 \r
+// provide an ASSERT macro for when compiled without MFC\r
+#if !defined ASSERT\r
+       #ifdef _DEBUG\r
+               #define ASSERT(x) {if(!(x)) _asm{int 0x03}}\r
+       #else\r
+               #define ASSERT(x)       \r
+       #endif\r
+#endif\r
+\r
+\r
 GitRev::GitRev(void)\r
 {\r
        m_Action=0;\r
@@ -69,7 +79,6 @@ int GitRev::ParserFromLog(BYTE_VECTOR &log,int start)
        this->m_Files.Clear();\r
     m_Action=0;\r
        int begintime=0;\r
-       BYTE *p=&log[0];\r
        int filebegin=-1;\r
 \r
        while( pos < log.size() && pos>=0)\r
@@ -197,7 +206,7 @@ CTime GitRev::ConverFromString(CString input)
        SYSTEMTIME sysTime;\r
        tm.GetAsSystemTime( sysTime );\r
        TIME_ZONE_INFORMATION timeZone;\r
-       if ( GetTimeZoneInformation( &timeZone ) == TIME_ZONE_ID_UNKNOWN )\r
+       if ( GetTimeZoneInformation( &timeZone ) == TIME_ZONE_ID_INVALID )\r
        {\r
                ASSERT(false);\r
        }\r