diff options
author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2006-12-10 02:12:23 +0000 |
---|---|---|
committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2006-12-10 02:12:23 +0000 |
commit | c3bad1afc1564f3bfac8434d45d6694811139333 (patch) | |
tree | ebfbbcf4dffdf4914b9ce879d3d2c93d3615f7ab /fipstest.cpp | |
parent | e553818e00684e8905ede16e53aa490c153b7e7a (diff) | |
download | cryptopp-c3bad1afc1564f3bfac8434d45d6694811139333.tar.gz |
port to GCC 4, reorganize implementations of SetKey
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@248 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'fipstest.cpp')
-rw-r--r-- | fipstest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fipstest.cpp b/fipstest.cpp index 109e592..2248d10 100644 --- a/fipstest.cpp +++ b/fipstest.cpp @@ -11,7 +11,7 @@ #define _WIN32_WINNT 0x0400 #include <windows.h> -#if defined(_MSC_VER) && _MSC_VER >= 14 +#if defined(_MSC_VER) && _MSC_VER >= 1400 #ifdef _M_IX86 #define _CRT_DEBUGGER_HOOK _crt_debugger_hook #else @@ -277,7 +277,7 @@ bool IntegrityCheckModule(const char *moduleFilename, const byte *expectedModule char moduleFilenameBuf[MAX_PATH] = ""; if (moduleFilename == NULL) { -#ifdef _MSC_VER // ifstream doesn't support wide filename on gcc 3.4.4 cygwin +#if (defined(_MSC_VER) && _MSC_VER >= 1400) // ifstream doesn't support wide filename on other compilers wchar_t wideModuleFilename[MAX_PATH]; if (GetModuleFileNameW(s_hModule, wideModuleFilename, MAX_PATH) > 0) { @@ -363,7 +363,7 @@ bool IntegrityCheckModule(const char *moduleFilename, const byte *expectedModule } } -#if defined(_MSC_VER) && _MSC_VER >= 14 +#if defined(_MSC_VER) && _MSC_VER >= 1400 // first byte of _CRT_DEBUGGER_HOOK gets modified in memory by the debugger invisibly, so read it from file if (IsDebuggerPresent()) { |