Skip to content

Commit

Permalink
release
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristy committed Oct 28, 2023
1 parent 189ae04 commit b3e4902
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 4 deletions.
3 changes: 3 additions & 0 deletions config/config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,9 @@
/* The size of `long double', as computed by sizeof. */
#undef SIZEOF_LONG_DOUBLE

/* The size of `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T

/* The size of `unsigned long long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG_LONG

Expand Down
39 changes: 36 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -5137,7 +5137,7 @@ MAGICK_PATCHLEVEL_VERSION=0

MAGICK_VERSION=6.9.13-0

MAGICK_GIT_REVISION=2d175da8a:20231021
MAGICK_GIT_REVISION=ca1aca5ca:20231027


# Substitute library versioning
Expand All @@ -5161,7 +5161,7 @@ PACKAGE_BASE_VERSION=6.9.13

PACKAGE_PATCHLEVEL_VERSION=0

if test "y" = 'y'; then
if test "n" = 'y'; then
PACKAGE_VERSION_ADDENDUM='-0 (Beta)'
else
PACKAGE_VERSION_ADDENDUM=-0
Expand All @@ -5171,7 +5171,7 @@ PACKAGE_LIB_VERSION=0x69C

PACKAGE_LIB_VERSION_NUMBER=6,9,13,0

PACKAGE_RELEASE_DATE=2023-10-21
PACKAGE_RELEASE_DATE=2023-10-27


# Ensure that make can run correctly
Expand Down Expand Up @@ -25747,6 +25747,39 @@ printf "%s\n" "$ac_cv_sizeof_unsigned_long_long" >&6; }
printf "%s\n" "#define SIZEOF_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long" >>confdefs.h


# 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.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
printf %s "checking size of size_t... " >&6; }
if test ${ac_cv_sizeof_size_t+y}
then :
printf %s "(cached) " >&6
else $as_nop
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"
then :

else $as_nop
if test "$ac_cv_type_size_t" = yes; then
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (size_t)
See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_sizeof_size_t=0
fi
fi

fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
printf "%s\n" "$ac_cv_sizeof_size_t" >&6; }



printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h



# 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
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1026,6 +1026,7 @@ AC_CHECK_SIZEOF([long double])
# SIZEOF_UNSIGNED_LONG_LONG. If 'unsigned long long' is not
# supported then the value defined is zero.
AC_CHECK_SIZEOF([unsigned long long])
AC_CHECK_SIZEOF([size_t])

AC_CHECK_SIZEOF([void *])

Expand Down
2 changes: 1 addition & 1 deletion m4/version.m4
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ m4_define([magick_major_version], [6])
m4_define([magick_minor_version], [9])
m4_define([magick_micro_version], [13])
m4_define([magick_patchlevel_version], [0])
m4_define([magick_is_beta], [y])
m4_define([magick_is_beta], [n])
m4_define([magick_base_version],
[magick_major_version.magick_minor_version.magick_micro_version])
m4_define([magick_version],
Expand Down

0 comments on commit b3e4902

Please sign in to comment.