(no commit message)

diff --git a/Magick++/lib/Blob.cpp b/Magick++/lib/Blob.cpp
index 96b97ec6f528c8a4ec44c18110ad3087ebe90045..a910d57a2519daed294f75739089bbc57dc4b4f5 100644 (file)
--- a/Magick++/lib/Blob.cpp
+++ b/Magick++/lib/Blob.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include "Magick++/Blob.h"
 #include "Magick++/BlobRef.h"

diff --git a/Magick++/lib/BlobRef.cpp b/Magick++/lib/BlobRef.cpp
index abc4eec121b0e0e32de45118ca10219159af3ece..dff30b7cd27fae8d168824859b4d35da18b89dfe 100644 (file)
--- a/Magick++/lib/BlobRef.cpp
+++ b/Magick++/lib/BlobRef.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include "Magick++/Thread.h"
 #include "Magick++/BlobRef.h"
@@ -30,7 +31,7 @@ Magick::BlobRef::BlobRef ( const void* data_,
   if( data_ )
     {
       _data = new unsigned char[length_];
-      MagickCore::memcpy( _data, data_, length_ );
+      memcpy( _data, data_, length_ );
     }
 }
 

diff --git a/Magick++/lib/CoderInfo.cpp b/Magick++/lib/CoderInfo.cpp
index 9d085566f295f48411d6c5bff897604b26c39a2f..530b315559e08c1081a1462051546965af07bca8 100644 (file)
--- a/Magick++/lib/CoderInfo.cpp
+++ b/Magick++/lib/CoderInfo.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION  1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include "Magick++/CoderInfo.h"
 #include "Magick++/Exception.h"

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 3a8f8b5bfcc4b104120f254639a34e7b760aac75..a4a63e21853fa06225fa6ea569891535113406fa 100644 (file)
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string>
 

diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp
index 082b36a7269dfd149cbb7241c50e6ce83da80b7d..77d4a64115b58d25dcf77a0987fd7d43dee77156 100644 (file)
--- a/Magick++/lib/Drawable.cpp
+++ b/Magick++/lib/Drawable.cpp
@@ -9,6 +9,7 @@
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 #define MAGICK_DRAWABLE_IMPLEMENTATION
 
+#include <cstring>
 #include <math.h>
 #include <string>
 #include "Magick++/Include.h"

diff --git a/Magick++/lib/Exception.cpp b/Magick++/lib/Exception.cpp
index d2e872c9f6dbde3eab77aecd67afa005436db785..3b9f9abf9ab02b6c3fadbeaf99c86f7e40923f85 100644 (file)
--- a/Magick++/lib/Exception.cpp
+++ b/Magick++/lib/Exception.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string>
 #include <errno.h>

diff --git a/Magick++/lib/Functions.cpp b/Magick++/lib/Functions.cpp
index 2d3a9d4edc60570f8fdb8fa339d26a11c7bbc301..99184a17d73975f44a732571f0ae6efd7698b8fa 100644 (file)
--- a/Magick++/lib/Functions.cpp
+++ b/Magick++/lib/Functions.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string>
 

diff --git a/Magick++/lib/Geometry.cpp b/Magick++/lib/Geometry.cpp
index 09e6483754a7a08a34382623357879614eea2a8a..ae4ac16045d277516e450b626354af3283cb2e1e 100644 (file)
--- a/Magick++/lib/Geometry.cpp
+++ b/Magick++/lib/Geometry.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string>
 #include <ctype.h> // for isdigit

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 35a6c3bb4f1ad1b750b3fad2ee2f5408b9f02729..94664bb1315c62671820077870a6b975a18d5c69 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -9,6 +9,7 @@
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
 #include <cstdlib>
+#include <cstring>
 #include <string>
 #include <string.h>
 #include <errno.h>

diff --git a/Magick++/lib/ImageRef.cpp b/Magick++/lib/ImageRef.cpp
index c736a897432c4fff7c07ff99cf50b5588df56803..e0996c0cbdeb37c8a32e4243145758f8a0bb4569 100644 (file)
--- a/Magick++/lib/ImageRef.cpp
+++ b/Magick++/lib/ImageRef.cpp
@@ -10,6 +10,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/ImageRef.h"
 #include "Magick++/Exception.h"
 #include "Magick++/Options.h"

diff --git a/Magick++/lib/Montage.cpp b/Magick++/lib/Montage.cpp
index 23d5efa2bdbdfa9b74960aaaf632634cc2c4d52d..c44b3e75dcb8927f7d8df37b36043fc999912b54 100644 (file)
--- a/Magick++/lib/Montage.cpp
+++ b/Magick++/lib/Montage.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string>
 #include <string.h>

diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
index 1ded7bc7ac90b64615702986b4608ea42fd314d7..c825cca2a6825d64b03df825b9a015fc1202ea81 100644 (file)
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -10,6 +10,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include <string>
 #include <string.h>
 #include <stdlib.h>

diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp
index 5f755706a2d04d95253eadffdc83a06c004ca844..d0e95b6b3cc24745083f836f0988c16c5338badd 100644 (file)
--- a/Magick++/lib/Pixels.cpp
+++ b/Magick++/lib/Pixels.cpp
@@ -8,6 +8,8 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string> // This is here to compile with Visual C++
 #include "Magick++/Thread.h"

diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp
index 0a79fcc7f4f10136930ad45637b24a93996ae153..543a71e6579c42c83dafe1044fef1184a30dfa3a 100644 (file)
--- a/Magick++/lib/STL.cpp
+++ b/Magick++/lib/STL.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include <Magick++/Image.h>
 #include <Magick++/STL.h>
 

diff --git a/Magick++/lib/Thread.cpp b/Magick++/lib/Thread.cpp
index 310794cb605c544546baa4d8f6ff9394bf86b8ab..1fa8788c4777b009e0afd87163169073be735ea7 100644 (file)
--- a/Magick++/lib/Thread.cpp
+++ b/Magick++/lib/Thread.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Thread.h"
 #include "Magick++/Exception.h"
 
@@ -28,7 +29,7 @@ Magick::MutexLock::MutexLock(void)
         return;
       }
   throwExceptionExplicit( OptionError, "mutex initialization failed",
-                          MagickCore::strerror(sysError) );
+                          strerror(sysError) );
 }
 #else
 #if defined(_VISUALC_) && defined(_MT)
@@ -63,7 +64,7 @@ Magick::MutexLock::~MutexLock(void)
   if ( (sysError = ::pthread_mutex_destroy( &_mutex )) == 0 )
     return;
   throwExceptionExplicit( OptionError, "mutex destruction failed",
-                          MagickCore::strerror(sysError) );
+                          strerror(sysError) );
 #endif
 #if defined(_MT) && defined(_VISUALC_)
   if ( ::CloseHandle(_mutex.id) != 0 )
@@ -80,7 +81,7 @@ void Magick::MutexLock::lock(void)
   if ( (sysError = ::pthread_mutex_lock( &_mutex )) == 0)
     return;
   throwExceptionExplicit( OptionError, "mutex lock failed",
-                          MagickCore::strerror(sysError));
+                          strerror(sysError));
 #endif
 #if defined(_MT) && defined(_VISUALC_)
   if (WaitForSingleObject(_mutex.id,INFINITE) != WAIT_FAILED)
@@ -97,7 +98,7 @@ void Magick::MutexLock::unlock(void)
   if ( (sysError = ::pthread_mutex_unlock( &_mutex )) == 0)
     return;
   throwExceptionExplicit( OptionError, "mutex unlock failed",
-                          MagickCore::strerror(sysError) );
+                          strerror(sysError) );
 #endif
 #if defined(_MT) && defined(_VISUALC_)
   if ( ReleaseSemaphore(_mutex.id, 1, NULL) == TRUE )

diff --git a/Magick++/lib/TypeMetric.cpp b/Magick++/lib/TypeMetric.cpp
index 68d1cec22cab73ccdd63594ea003fbaf8aac6b59..dbae23401e8934684ea2ecb1afbafe15e50284b9 100644 (file)
--- a/Magick++/lib/TypeMetric.cpp
+++ b/Magick++/lib/TypeMetric.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/TypeMetric.h"
 #include <string.h>