From: cristy Date: Tue, 1 Jun 2010 18:42:49 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9330 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=330e935b935573611f992e6ed3596ccc15f7fa42;p=imagemagick --- diff --git a/config/config.h.in b/config/config.h.in index 59350409c..2814622d9 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -813,6 +813,9 @@ /* The size of `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T +/* The size of `ssize_t', as computed by sizeof. */ +#undef SIZEOF_SSIZE_T + /* The size of `unsigned int', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_INT diff --git a/config/configure.xml b/config/configure.xml index ddbfe37bc..a32851684 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,7 +9,7 @@ - + diff --git a/configure b/configure index 3fb2b7708..020a3c521 100755 --- a/configure +++ b/configure @@ -22105,6 +22105,42 @@ _ACEOF +# Obtain size of ssize_t and define as SIZEOF_SSIZE_T +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5 +$as_echo_n "checking size of ssize_t... " >&6; } +if test "${ac_cv_sizeof_ssize_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ssize_t))" "ac_cv_sizeof_ssize_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_ssize_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (ssize_t) +See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_ssize_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ssize_t" >&5 +$as_echo "$ac_cv_sizeof_ssize_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t +_ACEOF + + + # Obtain size of an unsigned int pointer and define as SIZEOF_UNSIGNED_INTP # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects diff --git a/configure.ac b/configure.ac index 787a4e592..96a9a2e53 100755 --- a/configure.ac +++ b/configure.ac @@ -871,6 +871,9 @@ AC_CHECK_SIZEOF(off_t) # Obtain size of size_t and define as SIZEOF_SIZE_T AC_CHECK_SIZEOF(size_t) +# Obtain size of ssize_t and define as SIZEOF_SSIZE_T +AC_CHECK_SIZEOF(ssize_t) + # Obtain size of an unsigned int pointer and define as SIZEOF_UNSIGNED_INTP AC_CHECK_SIZEOF(unsigned int*) diff --git a/magick/magick-config.h b/magick/magick-config.h index bf4fdb835..eb92a8efa 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -1228,6 +1228,11 @@ #define MAGICKCORE_SIZEOF_SIZE_T 8 #endif +/* The size of `ssize_t', as computed by sizeof. */ +#ifndef MAGICKCORE_SIZEOF_SSIZE_T +#define MAGICKCORE_SIZEOF_SSIZE_T 8 +#endif + /* The size of `unsigned int', as computed by sizeof. */ #ifndef MAGICKCORE_SIZEOF_UNSIGNED_INT #define MAGICKCORE_SIZEOF_UNSIGNED_INT 4 diff --git a/magick/version.h b/magick/version.h index ab91dde92..c028e9739 100644 --- a/magick/version.h +++ b/magick/version.h @@ -33,8 +33,8 @@ extern "C" { #define MagickLibAddendum "-2" #define MagickLibInterface 3 #define MagickLibMinInterface 3 -#define MagickReleaseDate "2010-05-31" -#define MagickChangeDate "20100528" +#define MagickReleaseDate "2010-06-01" +#define MagickChangeDate "20100531" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.2/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8)