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
This commit is contained in:
Nick Mathewson 2006-06-03 18:52:31 +00:00
parent 8f902e4b58
commit 86da3e0a0a
2 changed files with 2 additions and 2 deletions

View File

@ -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); size_t strlcpy(char *dst, const char *src, size_t siz);
#endif #endif
#ifdef MS_WINDOWS #ifdef _MSC_VER
#define U64_PRINTF_ARG(a) (a) #define U64_PRINTF_ARG(a) (a)
#define U64_SCANF_ARG(a) (a) #define U64_SCANF_ARG(a) (a)
#define U64_FORMAT "%I64u" #define U64_FORMAT "%I64u"

View File

@ -15,7 +15,7 @@ const char torgzip_c_id[] =
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#ifdef MS_WINDOWS #ifdef _MSC_VER
#include "..\..\contrib\zlib\zlib.h" #include "..\..\contrib\zlib\zlib.h"
#else #else
#include <zlib.h> #include <zlib.h>