(no commit message)

diff --git a/magick/blob-private.h b/magick/blob-private.h
index ef1dcdfe900b64eb4d33ee9cb4cd47a2c4d56742..cbd8b2c062487dc2c574cb738a6798f064fb9018 100644 (file)
--- a/magick/blob-private.h
+++ b/magick/blob-private.h
@@ -26,6 +26,8 @@ extern "C" {
 #include "magick/stream.h"
 
 #define MagickMinBlobExtent  32767L
+#define MagickSeek(file,offset,whence)  lseek(file,offset,whence)
+#define MagickTell(file)  tell(file)
 
 typedef enum
 {

diff --git a/magick/magick.c b/magick/magick.c
index b3eca62d221df8c0d2bef6cff51b17efbbecb1b0..c222cf6da629cb6030996a25935eaff8a7f7f71b 100644 (file)
--- a/magick/magick.c
+++ b/magick/magick.c
@@ -43,6 +43,7 @@
 #include "magick/studio.h"
 #include "magick/annotate.h"
 #include "magick/blob.h"
+#include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/coder.h"
 #include "magick/client.h"

diff --git a/magick/nt-base.h b/magick/nt-base.h
index 2a031d7c3e53b20226f77146577a33d94002c956..6f141c13da72364f1f26c379b0e42adc25165610 100644 (file)
--- a/magick/nt-base.h
+++ b/magick/nt-base.h
@@ -127,6 +127,10 @@ extern "C" {
 #if !defined(isatty)
 #  define isatty _isatty
 #endif
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
+  !(defined(_MSC_VER) && (_MSC_VER < 1400)) &&  (__MSVCRT_VERSION__ < 0x800)
+#  define lseek  _lseeki64
+#endif
 #if !defined(MAGICKCORE_LTDL_DELEGATE)
 #if !defined(lt_dlclose)
 #  define lt_dlclose(handle)  NTCloseLibrary(handle)
@@ -207,6 +211,10 @@ extern "C" {
 #if !defined(sysconf)
 #  define sysconf(name)  NTSystemConfiguration(name)
 #endif
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
+  !(defined(_MSC_VER) && (_MSC_VER < 1400)) &&  (__MSVCRT_VERSION__ < 0x800)
+#  define tell  _telli64
+#endif
 #if !defined(telldir)
 #  define telldir(directory)  NTTellDirectory(directory)
 #endif

diff --git a/magick/studio.h b/magick/studio.h
index be40ba285c56ae0d695980f3d0acee2e637401a5..5a975f01c5e2e3eda5290cf6f9334bbf0950ff6c 100644 (file)
--- a/magick/studio.h
+++ b/magick/studio.h
@@ -427,17 +427,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 # define MAGICKCORE_BUILD_MODULES
 #endif
 
-/*
-  I/O defines.
-*/
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && !defined(__BORLANDC__)
-#define MagickSeek(file,offset,whence)  _lseeki64(file,offset,whence)
-#define MagickTell(file)  _telli64(file)
-#else
-#define MagickSeek(file,offset,whence)  lseek(file,offset,whence)
-#define MagickTell(file) tell(file)
-#endif
-
 /*
   Magick defines.
 */

diff --git a/wand/studio.h b/wand/studio.h
index e06b04d5ef9ef263d01df6a1de94e701901cc73f..8ca3168bb3059a7b65aaf10bd32fb5f74e38bd45 100644 (file)
--- a/wand/studio.h
+++ b/wand/studio.h
@@ -429,16 +429,8 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #endif
 
 /*
-  I/O defines.
+  Exception defines.
 */
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && !defined(__BORLANDC__)
-#define MagickSeek(file,offset,whence)  _lseeki64(file,offset,whence)
-#define MagickTell(file)  _telli64(file)
-#else
-#define MagickSeek(file,offset,whence)  lseek(file,offset,whence)
-#define MagickTell(file) tell(file)
-#endif
-
 #define ThrowWandFatalException(severity,tag,context) \
 { \
   ExceptionInfo \