From a1219f532d0e1359d3e12493c541bd778c273894 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 28 Jan 2018 11:23:12 -0500 Subject: [PATCH] static.h is now a public header --- MagickCore/MagickCore.h | 3 ++- MagickCore/Makefile.am | 2 +- Makefile.in | 2 +- configure | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h index 219cf0b8d..0e87cf01c 100644 --- a/MagickCore/MagickCore.h +++ b/MagickCore/MagickCore.h @@ -150,8 +150,9 @@ extern "C" { #include "MagickCore/shear.h" #include "MagickCore/signature.h" #include "MagickCore/splay-tree.h" -#include "MagickCore/stream.h" +#include "MagickCore/static.h" #include "MagickCore/statistic.h" +#include "MagickCore/stream.h" #include "MagickCore/string_.h" #include "MagickCore/timer.h" #include "MagickCore/token.h" diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am index 6ad9b09fe..cf1620b46 100644 --- a/MagickCore/Makefile.am +++ b/MagickCore/Makefile.am @@ -391,6 +391,7 @@ MAGICKCORE_INCLUDE_HDRS = \ MagickCore/shear.h \ MagickCore/signature.h \ MagickCore/splay-tree.h \ + MagickCore/static.h \ MagickCore/statistic.h \ MagickCore/stream.h \ MagickCore/string_.h \ @@ -462,7 +463,6 @@ MAGICKCORE_NOINST_HDRS = \ MagickCore/semaphore-private.h \ MagickCore/semaphore-private.h \ MagickCore/signature-private.h \ - MagickCore/static.h \ MagickCore/stream-private.h \ MagickCore/string-private.h \ MagickCore/thread_.h \ diff --git a/Makefile.in b/Makefile.in index 9f5d186e2..c0beb7d1a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4514,6 +4514,7 @@ MAGICKCORE_INCLUDE_HDRS = \ MagickCore/shear.h \ MagickCore/signature.h \ MagickCore/splay-tree.h \ + MagickCore/static.h \ MagickCore/statistic.h \ MagickCore/stream.h \ MagickCore/string_.h \ @@ -4585,7 +4586,6 @@ MAGICKCORE_NOINST_HDRS = \ MagickCore/semaphore-private.h \ MagickCore/semaphore-private.h \ MagickCore/signature-private.h \ - MagickCore/static.h \ MagickCore/stream-private.h \ MagickCore/string-private.h \ MagickCore/thread_.h \ diff --git a/configure b/configure index 426e54d3a..978bd3dd0 100755 --- a/configure +++ b/configure @@ -4550,7 +4550,7 @@ MAGICK_PATCHLEVEL_VERSION=23 MAGICK_VERSION=7.0.7-23 -MAGICK_GIT_REVISION=22496:aec427982:20180127 +MAGICK_GIT_REVISION=22524:0626b1628:20180128 # Substitute library versioning -- 2.40.0