From: cristy Date: Sat, 16 Feb 2013 15:44:08 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4232 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3b90d3dca25da66823239f2b40d813773345ab9;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index 2770fc1ae..920a4e14f 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC" -#define MagickSVNRevision "11008:11053M" +#define MagickSVNRevision "11008:11057M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 1 #define MagickLibMinInterface 1 -#define MagickReleaseDate "2013-02-15" +#define MagickReleaseDate "2013-02-16" #define MagickChangeDate "20121005" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" diff --git a/configure b/configure index 4f0d64218..0c52ea31a 100755 --- a/configure +++ b/configure @@ -3668,7 +3668,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=11008:11053M +MAGICK_SVN_REVISION=11008:11057M # Substitute library versioning @@ -8932,7 +8932,7 @@ fi case "$host" in *darwin* | *-macos10*) - CFLAGS="${CFLAGS} -DFORTIFY_SOURCE=0" + CFLAGS="${CFLAGS} -D_FORTIFY_SOURCE=0" # Check whether --enable-osx-universal-binary was given. if test "${enable_osx_universal_binary+set}" = set; then : enableval=$enable_osx_universal_binary; build_osxuniversal="${enableval}" diff --git a/configure.ac b/configure.ac index 398dca909..c5fa742e3 100755 --- a/configure.ac +++ b/configure.ac @@ -385,7 +385,7 @@ dnl Platform-specific stuff case "$host" in *darwin* | *-macos10*) dnl Disable FORTIFY_SOURCE to fix a bug in LVVM / OpenMP support - CFLAGS="${CFLAGS} -DFORTIFY_SOURCE=0" + CFLAGS="${CFLAGS} -D_FORTIFY_SOURCE=0" dnl OS X universal binary support, requires --disable-dependency-tracking AC_ARG_ENABLE([osx-universal-binary], AC_HELP_STRING([--enable-osx-universal-binary],