diff options
author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-04-06 15:42:20 +0000 |
---|---|---|
committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-04-06 15:42:20 +0000 |
commit | d9fd17a8be708ae3da8b4c66b6d0f7b0c85e5a49 (patch) | |
tree | 8b29bac6522f794de5964f874eed3ce2d993b595 | |
parent | 5c43a239b88fe42e581bbce96ac12046ff748cd4 (diff) | |
download | ports-d9fd17a8be708ae3da8b4c66b6d0f7b0c85e5a49.tar.gz ports-d9fd17a8be708ae3da8b4c66b6d0f7b0c85e5a49.zip |
Unbreak the build: as of recently, <assert.h> header file must be included
before <Magick++.h> because of the following conflict:
[...]: error: use of undeclared identifier '__assert'; did you mean
'MagickCore::__assert'?
assert( file.colorSpace() == Magick::sRGBColorspace );
^
/usr/include/assert.h:56:36: note: expanded from macro 'assert'
#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \
/usr/include/assert.h:77:6: note: 'MagickCore::__assert' declared here
void __assert(const char *, const char *, int, const char *) __dead2;
Reported by: pkg-fallout
Notes
Notes:
svn path=/head/; revision=530885
-rw-r--r-- | graphics/hdr_tools/files/patch-headers.hh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/graphics/hdr_tools/files/patch-headers.hh b/graphics/hdr_tools/files/patch-headers.hh new file mode 100644 index 000000000000..1d544c12c1b9 --- /dev/null +++ b/graphics/hdr_tools/files/patch-headers.hh @@ -0,0 +1,18 @@ +--- headers.hh.orig 2010-11-23 21:22:52 UTC ++++ headers.hh +@@ -30,6 +30,7 @@ + + + ++#include <assert.h> + #include <popt.h> + #include <tiff.h> + #include <tiffio.h> +@@ -61,7 +62,6 @@ + #include <cmath> + + +-#include <assert.h> + #include <stdlib.h> + #include <math.h> + #include <stdint.h> |