...

diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index c26c8b1cea72b5eaccc8b8897bb5e11de493192b..af51759e1c75b094ed7319658156032cd4e90a02 100644 (file)
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -36,6 +36,9 @@ extern "C" {
 # if defined(MAGICKCORE__FILE_OFFSET_BITS) && !defined(_FILE_OFFSET_BITS)
 # define _FILE_OFFSET_BITS MAGICKCORE__FILE_OFFSET_BITS
 #endif
+#if __cplusplus > 199711L
+#define register
+#endif  
 #if defined(_magickcore_const) && !defined(const)
 # define const  _magickcore_const
 #endif

diff --git a/MagickWand/studio.h b/MagickWand/studio.h
index 9d0a935e25754971de1876a5e94bfb3baff0b5db..9e8898bcfecf7f6cb9a8b00f836d15a373c282e9 100644 (file)
--- a/MagickWand/studio.h
+++ b/MagickWand/studio.h
@@ -36,6 +36,9 @@ extern "C" {
 #if defined(MAGICKCORE__FILE_OFFSET_BITS) && !defined(_FILE_OFFSET_BITS)
 # define _FILE_OFFSET_BITS MAGICKCORE__FILE_OFFSET_BITS
 #endif
+#if __cplusplus > 199711L
+#define register
+#endif  
 #if defined(_magickcore_const) && !defined(const)
 # define const _magickcore_const
 #endif

diff --git a/config/config.h.in b/config/config.h.in
index 42e5101e1982a8d014295c6a1411c4cce5cdd18e..e4102ec71475a81e6e7ec16ea0ab620123c8fdfc 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -106,6 +106,9 @@
 /* Define to 1 if you have the `clock' function. */
 #undef HAVE_CLOCK
 
+/* Define to 1 if you have the `clock_getres' function. */
+#undef HAVE_CLOCK_GETRES
+
 /* Define to 1 if you have clock_gettime. */
 #undef HAVE_CLOCK_GETTIME
 

diff --git a/configure b/configure
index a1e71e08a9cfbf3aa35f4d46e2f7c793e2b9fee9..66d0477d5a67216f988488f0ee913e9b1266bc04 100755 (executable)
--- a/configure
+++ b/configure
@@ -4517,7 +4517,7 @@ MAGICK_PATCHLEVEL_VERSION=8
 
 MAGICK_VERSION=7.0.2-8
 
-MAGICK_GIT_REVISION=18677:ad47284:20160807
+MAGICK_GIT_REVISION=18692:13267a1:20160813
 
 
 # Substitute library versioning