From: cristy Date: Thu, 30 Jun 2011 14:59:36 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7403 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8f722122556451cc6f752385503c0cc4bc63a01;p=imagemagick --- diff --git a/magick/nt-base.h b/magick/nt-base.h index 7fc8b253a..a933bf675 100644 --- a/magick/nt-base.h +++ b/magick/nt-base.h @@ -75,8 +75,10 @@ extern "C" { #endif #if !defined(access) +#if defined(_VISUALC_) && (_MSC_VER >= 1400) # define access(path,mode) _access_s(path,mode) #endif +#endif #if !defined(chdir) # define chdir _chdir #endif @@ -96,8 +98,6 @@ extern "C" { #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \ !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800) # define fseek _fseeki64 -#else -# define fseek _fseek #endif #endif #if !defined(fstat) && !defined(__BORLANDC__) @@ -115,8 +115,6 @@ extern "C" { #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \ !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800) # define ftell _ftelli64 -#else -# define ftell _ftell #endif #endif #if !defined(ftruncate) @@ -195,8 +193,10 @@ extern "C" { # define popen _popen #endif #if !defined(fprintf) +#if defined(_VISUALC_) && (_MSC_VER >= 1400) #define fprintf _fprintf_s #endif +#endif #if !defined(fprintf_l) #define fprintf_l _fprintf_s_l #endif