diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-06-03 18:52:31 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-06-03 18:52:31 +0000 |
| commit | 86da3e0a0af5813d6f5eb695d8353b2988f256ff (patch) | |
| tree | af5d5a5738cec35692d59d38d378da26cee9e67e /src | |
| parent | 8f902e4b58aed1788732c5f61686119b00e0382c (diff) | |
| download | tor-86da3e0a0af5813d6f5eb695d8353b2988f256ff.tar.gz tor-86da3e0a0af5813d6f5eb695d8353b2988f256ff.zip | |
Patch based on post by Mike C to or-dev; special-case based on use of MSVC, rather than on MS_WINDOWS, so that mingw builds.
svn:r6523
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compat.h | 2 | ||||
| -rw-r--r-- | src/common/torgzip.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 43199d9302..6116264d79 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -89,7 +89,7 @@ size_t strlcat(char *dst, const char *src, size_t siz); size_t strlcpy(char *dst, const char *src, size_t siz); #endif -#ifdef MS_WINDOWS +#ifdef _MSC_VER #define U64_PRINTF_ARG(a) (a) #define U64_SCANF_ARG(a) (a) #define U64_FORMAT "%I64u" diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 12cc7ec969..3542a48828 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -15,7 +15,7 @@ const char torgzip_c_id[] = #include <stdlib.h> #include <stdio.h> #include <assert.h> -#ifdef MS_WINDOWS +#ifdef _MSC_VER #include "..\..\contrib\zlib\zlib.h" #else #include <zlib.h> |