From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 19 Feb 2012 18:15:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2b5481f414ae5fe04ba5eb4b8b1cefa7cfb2b73;p=imagemagick

---

diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h
index d260d1373..ba3aec83b 100644
--- a/MagickCore/MagickCore.h
+++ b/MagickCore/MagickCore.h
@@ -55,114 +55,12 @@ extern "C" {
 #  define MAGICKCORE_POSIX_SUPPORT
 #endif 
 
-#if defined(__BORLANDC__) && defined(_DLL)
-#  pragma message("BCBMagick lib DLL export interface")
-#  define _MAGICKDLL_
-#  define _MAGICKLIB_
-#  define MAGICKCORE_MODULES_SUPPORT
-#  undef MAGICKCORE_BUILD_MODULES
-#endif
-
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
-# define MagickPrivate
-# if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) && !defined(MAGICK_STATIC_LINK)
-#  define _MAGICKDLL_
-# endif
-# if defined(_MAGICKDLL_)
-#  if defined(_VISUALC_)
-#   pragma warning( disable: 4273 )  /* Disable the dll linkage warnings */
-#  endif
-#  if !defined(_MAGICKLIB_)
-#   if defined(__GNUC__)
-#    define MagickExport __attribute__ ((__dllimport__))
-#   else
-#    define MagickExport __declspec(dllimport)
-#   endif
-#   if defined(_VISUALC_)
-#    pragma message( "Magick lib DLL import interface" )
-#   endif
-#  else
-#   if defined(__GNUC__)
-#    define MagickExport __attribute__ ((__dllexport__))
-#   else
-#    define MagickExport __declspec(dllexport)
-#   endif
-#   if defined(_VISUALC_)
-#    pragma message( "Magick lib DLL export interface" )
-#   endif
-#  endif
-# else
-#  define MagickExport
-#  if defined(_VISUALC_)
-#   pragma message( "Magick lib static interface" )
-#  endif
-# endif
-
-# if defined(_DLL) && !defined(_LIB)
-#  define ModuleExport  __declspec(dllexport)
-#  if defined(_VISUALC_)
-#   pragma message( "Magick module DLL export interface" )
-#  endif
-# else
-#  define ModuleExport
-#  if defined(_VISUALC_)
-#   pragma message( "Magick module static interface" )
-#  endif
-
-# endif
-# define MagickGlobal __declspec(thread)
-# if defined(_VISUALC_)
-#  pragma warning(disable : 4018)
-#  pragma warning(disable : 4244)
-#  pragma warning(disable : 4142)
-#  pragma warning(disable : 4800)
-#  pragma warning(disable : 4786)
-#  pragma warning(disable : 4996)
-# endif
-#else
-# if __GNUC__ >= 4
-#  define MagickExport __attribute__ ((__visibility__ ("default")))
-#  define MagickPrivate  __attribute__ ((__visibility__ ("hidden")))
-# else
-#   define MagickExport
-#   define MagickPrivate
-# endif
-# define ModuleExport  MagickExport
-# define MagickGlobal
-#endif
-
-#if !defined(MaxTextExtent)
-#  define MaxTextExtent  4096
-#endif
-#define MagickSignature  0xabacadabUL
-
-#if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
-#  define magick_aligned(x)  __attribute__((__aligned__(x)))
-#  define magick_attribute  __attribute__
-#  define magick_unused(x)  magick_unused_ ## x __attribute__((__unused__))
-#else
-#  define magick_aligned(x)  /* nothing */
-#  define magick_attribute(x)  /* nothing */
-#  define magick_unused(x) x
-#endif
-
-#if defined(MAGICKCORE_HAVE___ALLOC_SIZE__)
-#  define magick_alloc_size(x)  __attribute__((__alloc_size__(x)))
-#  define magick_alloc_sizes(x,y)  __attribute__((__alloc_size__(x,y)))
-#  define magick_cold_spot  __attribute__((__cold__))
-#  define magick_hot_spot  __attribute__((__hot__))
-#else
-#  define magick_alloc_size(x)  /* nothing */
-#  define magick_alloc_sizes(x,y)  /* nothing */
-#  define magick_cold_spot
-#  define magick_hot_spot
-#endif
+#include "MagickCore/method-attribute.h"
 
 #if defined(MAGICKCORE_NAMESPACE_PREFIX)
 # include "MagickCore/methods.h"
 #endif
 #include "MagickCore/magick-type.h"
-#include "MagickCore/xwindow.h"
 #include "MagickCore/accelerate.h"
 #include "MagickCore/animate.h"
 #include "MagickCore/annotate.h"
@@ -184,6 +82,7 @@ extern "C" {
 #include "MagickCore/constitute.h"
 #include "MagickCore/decorate.h"
 #include "MagickCore/delegate.h"
+#include "MagickCore/deprecate.h"
 #include "MagickCore/display.h"
 #include "MagickCore/distort.h"
 #include "MagickCore/draw.h"
@@ -213,11 +112,9 @@ extern "C" {
 #include "MagickCore/monitor.h"
 #include "MagickCore/montage.h"
 #include "MagickCore/morphology.h"
-#include "MagickCore/nt-base.h"
 #include "MagickCore/option.h"
 #include "MagickCore/paint.h"
 #include "MagickCore/pixel.h"
-#include "MagickCore/pixel-accessor.h"
 #include "MagickCore/policy.h"
 #include "MagickCore/prepress.h"
 #include "MagickCore/profile.h"
@@ -244,6 +141,7 @@ extern "C" {
 #include "MagickCore/utility.h"
 #include "MagickCore/version.h"
 #include "MagickCore/xml-tree.h"
+#include "MagickCore/xwindow.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index cea859cd0..f03eeb0f0 100644
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -161,6 +161,7 @@ MAGICKCORE_BASE_SRCS = \
 	MagickCore/matrix-private.h \
 	MagickCore/memory.c \
 	MagickCore/memory_.h \
+	MagickCore/method-attribute.h \
 	MagickCore/methods.h \
 	MagickCore/mime.c \
 	MagickCore/mime.h \
@@ -326,6 +327,7 @@ MAGICKCORE_INCLUDE_HDRS = \
 	MagickCore/magick-type.h \
 	MagickCore/matrix.h \
 	MagickCore/memory_.h \
+	MagickCore/method-attribute.h \
 	MagickCore/methods.h \
 	MagickCore/mime.h \
 	MagickCore/module.h \
diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 5a7a00235..6c325993c 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -1166,11 +1166,6 @@
 /* Define to 1 if you have the `_wstat' function. */
 /* #undef HAVE__WSTAT */
 
-/* define if your compiler has __alloc_size__ */
-#ifndef MAGICKCORE_HAVE___ALLOC_SIZE__
-#define MAGICKCORE_HAVE___ALLOC_SIZE__ 1
-#endif
-
 /* define if your compiler has __attribute__ */
 #ifndef MAGICKCORE_HAVE___ATTRIBUTE__
 #define MAGICKCORE_HAVE___ATTRIBUTE__ 1
diff --git a/MagickCore/method-attribute.h b/MagickCore/method-attribute.h
new file mode 100644
index 000000000..4b79d2a6f
--- /dev/null
+++ b/MagickCore/method-attribute.h
@@ -0,0 +1,137 @@
+/*
+  Copyright 1999-2012 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 method attributes.
+*/
+#ifndef _MAGICKCORE_METHOD_ATTRIBUTE_H
+#define _MAGICKCORE_METHOD_ATTRIBUTE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#if defined(__BORLANDC__) && defined(_DLL)
+#  pragma message("BCBMagick lib DLL export interface")
+#  define _MAGICKDLL_
+#  define _MAGICKLIB_
+#  define MAGICKCORE_MODULES_SUPPORT
+#  undef MAGICKCORE_BUILD_MODULES
+#endif
+
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
+# define MagickPrivate
+# if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
+#  define _MAGICKDLL_
+# endif
+# if defined(_MAGICKDLL_)
+#  if defined(_VISUALC_)
+#   pragma warning( disable: 4273 )  /* Disable the dll linkage warnings */
+#  endif
+#  if !defined(_MAGICKLIB_)
+#   if defined(__GNUC__)
+#    define MagickExport __attribute__ ((dllimport))
+#   else
+#    define MagickExport __declspec(dllimport)
+#   endif
+#   if defined(_VISUALC_)
+#    pragma message( "MagickCore lib DLL import interface" )
+#   endif
+#  else
+#   if defined(__GNUC__)
+#    define MagickExport __attribute__ ((dllexport))
+#   else
+#    define MagickExport __declspec(dllexport)
+#   endif
+#   if defined(_VISUALC_)
+#    pragma message( "MagickCore lib DLL export interface" )
+#   endif
+#  endif
+# else
+#  define MagickExport
+#  if defined(_VISUALC_)
+#   pragma message( "MagickCore lib static interface" )
+#  endif
+# endif
+
+# if defined(_DLL) && !defined(_LIB)
+#   if defined(__GNUC__)
+#    define ModuleExport __attribute__ ((dllexport))
+#   else
+#    define ModuleExport __declspec(dllexport)
+#   endif
+#  if defined(_VISUALC_)
+#   pragma message( "MagickCore module DLL export interface" )
+#  endif
+# else
+#  define ModuleExport
+#  if defined(_VISUALC_)
+#   pragma message( "MagickCore module static interface" )
+#  endif
+
+# endif
+# define MagickGlobal __declspec(thread)
+# if defined(_VISUALC_)
+#  pragma warning(disable : 4018)
+#  pragma warning(disable : 4068)
+#  pragma warning(disable : 4244)
+#  pragma warning(disable : 4142)
+#  pragma warning(disable : 4800)
+#  pragma warning(disable : 4786)
+#  pragma warning(disable : 4996)
+# endif
+#else
+# if __GNUC__ >= 4
+#  define MagickExport __attribute__ ((visibility ("default")))
+#  define MagickPrivate  __attribute__ ((visibility ("hidden")))
+# else
+#   define MagickExport
+#   define MagickPrivate
+# endif
+# define ModuleExport  MagickExport
+# define MagickGlobal
+#endif
+
+#define MagickSignature  0xabacadabUL
+#if !defined(MaxTextExtent)
+# define MaxTextExtent  4096
+#endif
+
+#if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
+#  define magick_aligned(x)  __attribute__((aligned(x)))
+#  define magick_attribute  __attribute__
+#  define magick_unused(x)  magick_unused_ ## x __attribute__((unused))
+#else
+#  define magick_aligned(x)  /* nothing */
+#  define magick_attribute(x)  /* nothing */
+#  define magick_unused(x) x
+#endif
+
+#if (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
+#  define magick_alloc_size(x)  __attribute__((__alloc_size__(x)))
+#  define magick_alloc_sizes(x,y)  __attribute__((__alloc_size__(x,y)))
+#  define magick_cold_spot  __attribute__((__cold__))
+#  define magick_hot_spot  __attribute__((__hot__))
+#else
+#  define magick_alloc_size(x)  /* nothing */
+#  define magick_alloc_sizes(x,y)  /* nothing */
+#  define magick_cold_spot
+#  define magick_hot_spot
+#endif
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif
diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index 3c3c86551..eaa5c2e06 100644
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -160,6 +160,8 @@ extern size_t strlcpy(char *,const char *,size_t);
 extern int vsnprintf(char *,size_t,const char *,va_list);
 #endif
 
+#include "MagickCore/method-attribute.h"
+
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT)
 # include <sys/types.h>
 # include <sys/stat.h>
@@ -233,8 +235,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 # include "MagickCore/vms.h"
 #endif
 
-#include "MagickCore/MagickCore.h"
-
 #undef HAVE_CONFIG_H
 #undef gamma
 #undef index
diff --git a/MagickCore/version.h b/MagickCore/version.h
index cd4f609e1..295113fc8 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-02-18"
+#define MagickReleaseDate  "2012-02-19"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index 5f52b7056..c24dedc79 100644
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -47,6 +47,7 @@ MAGICKWAND_SOURCES = \
 	MagickWand/magick-cli.h \
 	MagickWand/magick-wand.c \
 	MagickWand/magick-wand-private.h \
+	MagickWand/method-attribute.h \
 	MagickWand/mogrify.c \
 	MagickWand/mogrify.h \
 	MagickWand/mogrify-private.h \
@@ -82,6 +83,7 @@ MAGICKWAND_INCLUDE_HDRS = \
 	MagickWand/magick-cli.h \
 	MagickWand/magick-image.h \
 	MagickWand/magick-property.h \
+	MagickWand/method-attribute.h \
 	MagickWand/mogrify.h \
 	MagickWand/montage.h \
 	MagickWand/operation.h \
diff --git a/MagickWand/method-attribute.h b/MagickWand/method-attribute.h
new file mode 100644
index 000000000..40d5e2c96
--- /dev/null
+++ b/MagickWand/method-attribute.h
@@ -0,0 +1,130 @@
+/*
+  Copyright 1999-2012 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.
+
+  MagickWand method attributes.
+*/
+#ifndef _MAGICKWAND_METHOD_ATTRIBUTE_H
+#define _MAGICKWAND_METHOD_ATTRIBUTE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#if defined(__BORLANDC__) && defined(_DLL)
+#  pragma message("BCBMagick lib DLL export interface")
+#  define _MAGICKDLL_
+#  define _MAGICKLIB_
+#  define MAGICKCORE_MODULES_SUPPORT
+#  undef MAGICKCORE_BUILD_MODULES
+#endif
+
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
+# define MagickPrivate
+# if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
+#  define _MAGICKDLL_
+# endif
+# if defined(_MAGICKDLL_)
+#  if defined(_VISUALC_)
+#   pragma warning( disable: 4273 )  /* Disable the dll linkage warnings */
+#  endif
+#  if !defined(_MAGICKLIB_)
+#   if defined(__GNUC__)
+#    define MagickExport __attribute__ ((dllimport))
+#   else
+#    define MagickExport __declspec(dllimport)
+#   endif
+#   if defined(_VISUALC_)
+#    pragma message( "MagickCore lib DLL import interface" )
+#   endif
+#  else
+#   if defined(__GNUC__)
+#    define MagickExport __attribute__ ((dllexport))
+#   else
+#    define MagickExport __declspec(dllexport)
+#   endif
+#   if defined(_VISUALC_)
+#    pragma message( "MagickCore lib DLL export interface" )
+#   endif
+#  endif
+# else
+#  define MagickExport
+#  if defined(_VISUALC_)
+#   pragma message( "MagickCore lib static interface" )
+#  endif
+# endif
+
+# if defined(_DLL) && !defined(_LIB)
+#  if defined(_VISUALC_)
+#   pragma message( "MagickCore module DLL export interface" )
+#  endif
+# else
+#  if defined(_VISUALC_)
+#   pragma message( "MagickCore module static interface" )
+#  endif
+
+# endif
+# define MagickGlobal __declspec(thread)
+# if defined(_VISUALC_)
+#  pragma warning(disable : 4018)
+#  pragma warning(disable : 4068)
+#  pragma warning(disable : 4244)
+#  pragma warning(disable : 4142)
+#  pragma warning(disable : 4800)
+#  pragma warning(disable : 4786)
+#  pragma warning(disable : 4996)
+# endif
+#else
+# if __GNUC__ >= 4
+#  define MagickExport __attribute__ ((visibility ("default")))
+#  define MagickPrivate  __attribute__ ((visibility ("hidden")))
+# else
+#   define MagickExport
+#   define MagickPrivate
+# endif
+# define MagickGlobal
+#endif
+
+#define MagickSignature  0xabacadabUL
+#if !defined(MaxTextExtent)
+# define MaxTextExtent  4096
+#endif
+
+#if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
+#  define magick_aligned(x)  __attribute__((aligned(x)))
+#  define magick_attribute  __attribute__
+#  define magick_unused(x)  magick_unused_ ## x __attribute__((unused))
+#else
+#  define magick_aligned(x)  /* nothing */
+#  define magick_attribute(x)  /* nothing */
+#  define magick_unused(x) x
+#endif
+
+#if (((__GNUC__) > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
+#  define magick_alloc_size(x)  __attribute__((__alloc_size__(x)))
+#  define magick_alloc_sizes(x,y)  __attribute__((__alloc_size__(x,y)))
+#  define magick_cold_spot  __attribute__((__cold__))
+#  define magick_hot_spot  __attribute__((__hot__))
+#else
+#  define magick_alloc_size(x)  /* nothing */
+#  define magick_alloc_sizes(x,y)  /* nothing */
+#  define magick_cold_spot
+#  define magick_hot_spot
+#endif
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif
diff --git a/Makefile.in b/Makefile.in
index eae8c8e4d..770220a51 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -275,7 +275,6 @@ subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_func_fseeko.m4 \
 	$(top_srcdir)/m4/argz.m4 \
-	$(top_srcdir)/m4/ax_c___alloc_size__.m4 \
 	$(top_srcdir)/m4/ax_c___attribute__.m4 \
 	$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
 	$(top_srcdir)/m4/ax_compare_version.m4 \
@@ -428,15 +427,16 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
 	MagickCore/magick-config.h MagickCore/magick-type.h \
 	MagickCore/magick.h MagickCore/matrix.c MagickCore/matrix.h \
 	MagickCore/matrix-private.h MagickCore/memory.c \
-	MagickCore/memory_.h MagickCore/methods.h MagickCore/mime.c \
-	MagickCore/mime.h MagickCore/module.c MagickCore/module.h \
-	MagickCore/monitor.c MagickCore/monitor.h \
-	MagickCore/monitor-private.h MagickCore/montage.c \
-	MagickCore/montage.h MagickCore/morphology.c \
-	MagickCore/morphology.h MagickCore/morphology-private.h \
-	MagickCore/nt-base.h MagickCore/nt-base-private.h \
-	MagickCore/option.c MagickCore/option.h MagickCore/paint.c \
-	MagickCore/paint.h MagickCore/pixel.c MagickCore/pixel.h \
+	MagickCore/memory_.h MagickCore/method-attribute.h \
+	MagickCore/methods.h MagickCore/mime.c MagickCore/mime.h \
+	MagickCore/module.c MagickCore/module.h MagickCore/monitor.c \
+	MagickCore/monitor.h MagickCore/monitor-private.h \
+	MagickCore/montage.c MagickCore/montage.h \
+	MagickCore/morphology.c MagickCore/morphology.h \
+	MagickCore/morphology-private.h MagickCore/nt-base.h \
+	MagickCore/nt-base-private.h MagickCore/option.c \
+	MagickCore/option.h MagickCore/paint.c MagickCore/paint.h \
+	MagickCore/pixel.c MagickCore/pixel.h \
 	MagickCore/pixel-accessor.h MagickCore/policy.c \
 	MagickCore/policy.h MagickCore/PreRvIcccm.c \
 	MagickCore/PreRvIcccm.h MagickCore/prepress.c \
@@ -4041,6 +4041,7 @@ MAGICKCORE_BASE_SRCS = \
 	MagickCore/matrix-private.h \
 	MagickCore/memory.c \
 	MagickCore/memory_.h \
+	MagickCore/method-attribute.h \
 	MagickCore/methods.h \
 	MagickCore/mime.c \
 	MagickCore/mime.h \
@@ -4204,6 +4205,7 @@ MAGICKCORE_INCLUDE_HDRS = \
 	MagickCore/magick-type.h \
 	MagickCore/matrix.h \
 	MagickCore/memory_.h \
+	MagickCore/method-attribute.h \
 	MagickCore/methods.h \
 	MagickCore/mime.h \
 	MagickCore/module.h \
@@ -4356,6 +4358,7 @@ MAGICKWAND_SOURCES = \
 	MagickWand/magick-cli.h \
 	MagickWand/magick-wand.c \
 	MagickWand/magick-wand-private.h \
+	MagickWand/method-attribute.h \
 	MagickWand/mogrify.c \
 	MagickWand/mogrify.h \
 	MagickWand/mogrify-private.h \
@@ -4391,6 +4394,7 @@ MAGICKWAND_INCLUDE_HDRS = \
 	MagickWand/magick-cli.h \
 	MagickWand/magick-image.h \
 	MagickWand/magick-property.h \
+	MagickWand/method-attribute.h \
 	MagickWand/mogrify.h \
 	MagickWand/montage.h \
 	MagickWand/operation.h \
diff --git a/config/config.h.in b/config/config.h.in
index 24a6f1a61..8e56fca1e 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -761,9 +761,6 @@
 /* Define to 1 if you have the `_wstat' function. */
 #undef HAVE__WSTAT
 
-/* define if your compiler has __alloc_size__ */
-#undef HAVE___ALLOC_SIZE__
-
 /* define if your compiler has __attribute__ */
 #undef HAVE___ATTRIBUTE__
 
diff --git a/config/configure.xml b/config/configure.xml
index ccdd6bd32..17480c625 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="6876" />
-  <configure name="RELEASE_DATE" value="2012-02-18"/>
+  <configure name="RELEASE_DATE" value="2012-02-19"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/configure b/configure
index 92e250742..f15867c60 100755
--- a/configure
+++ b/configure
@@ -8024,46 +8024,6 @@ $as_echo "#define HAVE___ATTRIBUTE__ 1" >>confdefs.h
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __alloc_size__" >&5
-$as_echo_n "checking for __alloc_size__... " >&6; }
-if ${ax_cv___alloc_size__+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-	  static void foo(const size_t) __attribute__((__alloc_size__(1)));
-	  static void
-	  foo(const size_t bar) {
-	      exit(1);
-	  }
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv___alloc_size__=yes
-else
-  ax_cv___alloc_size__=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv___alloc_size__" >&5
-$as_echo "$ax_cv___alloc_size__" >&6; }
-  if test "$ax_cv___alloc_size__" = "yes"; then
-
-$as_echo "#define HAVE___ALLOC_SIZE__ 1" >>confdefs.h
-
-  fi
-
-
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
diff --git a/configure.ac b/configure.ac
index b18999cfe..f16c6f126 100755
--- a/configure.ac
+++ b/configure.ac
@@ -261,7 +261,6 @@ AC_PROG_MAKE_SET
 AC_PROG_LN_S
 AM_WITH_DMALLOC
 AX_C___ATTRIBUTE__
-AX_C___ALLOC_SIZE__
 PKG_PROG_PKG_CONFIG
 
 #
diff --git a/m4/ax_c___alloc_size__.m4 b/m4/ax_c___alloc_size__.m4
deleted file mode 100644
index c26fe91f0..000000000
--- a/m4/ax_c___alloc_size__.m4
+++ /dev/null
@@ -1,66 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_c___alloc_size__.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_C___ALLOC_SIZE__
-#
-# DESCRIPTION
-#
-#   Provides a test for the compiler support of __alloc_size__ extensions.
-#   Defines HAVE___ALLOC_SIZE__ if it is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stepan Kasal <skasal@redhat.com>
-#   Copyright (c) 2008 Christian Haggstrom
-#   Copyright (c) 2008 Ryan McCabe <ryan@numb.org>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 8
-
-AC_DEFUN([AX_C___ALLOC_SIZE__], [
-  AC_CACHE_CHECK([for __alloc_size__], [ax_cv___alloc_size__],
-    [AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM(
-	[[#include <stdlib.h>
-	  static void foo(const size_t) __attribute__((__alloc_size__(1)));
-	  static void
-	  foo(const size_t bar) {
-	      exit(1);
-	  }
-        ]], [])],
-      [ax_cv___alloc_size__=yes],
-      [ax_cv___alloc_size__=no]
-    )
-  ])
-  if test "$ax_cv___alloc_size__" = "yes"; then
-    AC_DEFINE([HAVE___ALLOC_SIZE__], 1, [define if your compiler has __alloc_size__])
-  fi
-])