From c6e9179e0181ba6599e5f03c30996100dac1716f Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 13 Oct 2011 18:39:26 +0000 Subject: [PATCH] --- MagickCore/version.h | 2 +- Makefile.in | 3 +-- config/configure.xml | 2 +- configure | 5 ++-- m4/strerror_r.m4 | 59 -------------------------------------------- 5 files changed, 6 insertions(+), 65 deletions(-) delete mode 100644 m4/strerror_r.m4 diff --git a/MagickCore/version.h b/MagickCore/version.h index c192568f0..557c38c74 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "5619" +#define MagickSVNRevision "5636" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 diff --git a/Makefile.in b/Makefile.in index 654a46f4c..891966a75 100644 --- a/Makefile.in +++ b/Makefile.in @@ -293,8 +293,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_func_fseeko.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/magick_check_pthread_lib.m4 \ $(top_srcdir)/m4/magick_func_mmap_fileio.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/strerror_r.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/config/configure.xml b/config/configure.xml index 7757c323a..849531d43 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,7 +10,7 @@ - + diff --git a/configure b/configure index 7ca3803fd..8bb64ab3f 100755 --- a/configure +++ b/configure @@ -3584,7 +3584,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=5619 +MAGICK_SVN_REVISION=5636 @@ -24703,6 +24703,7 @@ main () char buf[100]; char x = *strerror_r (0, buf, sizeof buf); char *p = strerror_r (0, buf, sizeof buf); + return !p || x; ; return 0; @@ -24731,7 +24732,7 @@ main () { char buf[100]; char x = *strerror_r (0, buf, sizeof buf); - exit (!isalpha (x)); + return ! isalpha (x); ; return 0; } diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4 deleted file mode 100644 index bd2863528..000000000 --- a/m4/strerror_r.m4 +++ /dev/null @@ -1,59 +0,0 @@ -#serial 1003 -# Experimental replacement for the function in the latest CVS autoconf. -# Use with the error.c file in ../lib. - -# Copyright 2001 Free Software Foundation, Inc. - -# 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, 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, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -undefine([AC_FUNC_STRERROR_R]) - -# AC_FUNC_STRERROR_R -# ------------------ -AC_DEFUN([AC_FUNC_STRERROR_R], -[AC_CHECK_DECLS([strerror_r]) -AC_CHECK_FUNCS([strerror_r]) -AC_CACHE_CHECK([whether strerror_r returns char *], - ac_cv_func_strerror_r_char_p, - [ - ac_cv_func_strerror_r_char_p=no - if test $ac_cv_have_decl_strerror_r = yes; then - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], - [[ - char buf[100]; - char x = *strerror_r (0, buf, sizeof buf); - char *p = strerror_r (0, buf, sizeof buf); - ]])], - ac_cv_func_strerror_r_char_p=yes) - else - # strerror_r is not declared. Choose between - # systems that have relatively inaccessible declarations for the - # function. BeOS and DEC UNIX 4.0 fall in this category, but the - # former has a strerror_r that returns char*, while the latter - # has a strerror_r that returns `int'. - # This test should segfault on the DEC system. - AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT - extern char *strerror_r ();], - [[char buf[100]; - char x = *strerror_r (0, buf, sizeof buf); - exit (!isalpha (x));]])], - ac_cv_func_strerror_r_char_p=yes, , :) - fi - ]) -if test $ac_cv_func_strerror_r_char_p = yes; then - AC_DEFINE([STRERROR_R_CHAR_P], 1, - [Define to 1 if strerror_r returns char *.]) -fi -])# AC_FUNC_STRERROR_R -- 2.40.0