From: cristy Date: Thu, 19 May 2011 02:35:46 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7538 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1cdbd90c8797bc78e04df015ddbe14878db5996;p=imagemagick --- diff --git a/Makefile.in b/Makefile.in index d5612f95a..9940bb1eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1390,14 +1390,14 @@ am__magick_libMagickCore_la_SOURCES_DIST = magick/ImageMagick.h \ magick/image.h magick/image-private.h magick/image-view.c \ magick/image-view.h magick/layer.c magick/layer.h \ magick/list.c magick/list.h magick/locale.c magick/locale_.h \ - magick/log.c magick/log.h magick/mac.h magick/magic.c \ - magick/magic.h magick/magick.c magick/magick-config.h \ - magick/magick-type.h magick/magick.h magick/matrix.c \ - magick/matrix.h magick/memory.c magick/memory_.h \ - magick/methods.h magick/mime.c magick/mime.h magick/module.c \ - magick/module.h magick/monitor.c magick/monitor.h \ - magick/monitor-private.h magick/montage.c magick/montage.h \ - magick/morphology.c magick/morphology.h \ + magick/locale-private.h magick/log.c magick/log.h magick/mac.h \ + magick/magic.c magick/magic.h magick/magick.c \ + magick/magick-config.h magick/magick-type.h magick/magick.h \ + magick/matrix.c magick/matrix.h magick/memory.c \ + magick/memory_.h magick/methods.h magick/mime.c magick/mime.h \ + magick/module.c magick/module.h magick/monitor.c \ + magick/monitor.h magick/monitor-private.h magick/montage.c \ + magick/montage.h magick/morphology.c magick/morphology.h \ magick/morphology-private.h magick/nt-base.h \ magick/nt-feature.h magick/option.c magick/option.h \ magick/paint.c magick/paint.h magick/pixel.c magick/pixel.h \ @@ -3933,6 +3933,7 @@ MAGICK_BASE_SRCS = \ magick/list.h \ magick/locale.c \ magick/locale_.h \ + magick/locale-private.h \ magick/log.c \ magick/log.h \ magick/mac.h \ @@ -4164,6 +4165,7 @@ MAGICK_NOINST_HDRS = \ magick/exception-private.h \ magick/fx-private.h \ magick/image-private.h \ + magick/locale-private.h \ magick/mac.h \ magick/mime-private.h \ magick/monitor-private.h \ diff --git a/config/delegates.xml b/config/delegates.xml index 1abcbb84f..c9e321dd9 100644 --- a/config/delegates.xml +++ b/config/delegates.xml @@ -87,7 +87,7 @@ - + @@ -100,11 +100,11 @@ - + - + diff --git a/magick/Makefile.am b/magick/Makefile.am index 6abc3cc8f..ca09f4b51 100644 --- a/magick/Makefile.am +++ b/magick/Makefile.am @@ -150,6 +150,7 @@ MAGICK_BASE_SRCS = \ magick/list.h \ magick/locale.c \ magick/locale_.h \ + magick/locale-private.h \ magick/log.c \ magick/log.h \ magick/mac.h \ @@ -386,6 +387,7 @@ MAGICK_NOINST_HDRS = \ magick/exception-private.h \ magick/fx-private.h \ magick/image-private.h \ + magick/locale-private.h \ magick/mac.h \ magick/mime-private.h \ magick/monitor-private.h \ diff --git a/magick/locale-private.h b/magick/locale-private.h new file mode 100644 index 000000000..790014af4 --- /dev/null +++ b/magick/locale-private.h @@ -0,0 +1,29 @@ +/* + Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization + dedicated to making software imaging solutions freely available. + + You may not use this file except in compliance with the License. + obtain a copy of the License at + + http://www.imagemagick.org/script/license.php + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + MagickCore localre private methods. +*/ +#ifndef _MAGICKCORE_LOCALE_PRIVATE_H +#define _MAGICKCORE_LOCALE_PRIVATE_H + +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif + +#endif