diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-05-28 16:00:17 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-05-28 16:00:17 +0000 |
| commit | b6d1f6ddec1e8dc66914f70a4c400f06c9eb2835 (patch) | |
| tree | 73ba1791c5b413f813634413be794c68355209db /editors/calligra/files | |
| parent | - Update to 0.27 (diff) | |
Fix koffice on current/amd64
Notes
Notes:
svn path=/head/; revision=192196
Diffstat (limited to 'editors/calligra/files')
| -rw-r--r-- | editors/calligra/files/patch-filters_krita_tiff-kis_tiff_reader.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/editors/calligra/files/patch-filters_krita_tiff-kis_tiff_reader.h b/editors/calligra/files/patch-filters_krita_tiff-kis_tiff_reader.h new file mode 100644 index 000000000000..21642547bfec --- /dev/null +++ b/editors/calligra/files/patch-filters_krita_tiff-kis_tiff_reader.h @@ -0,0 +1,25 @@ +--- filters/krita/tiff/kis_tiff_reader.h 2006/10/15 22:49:50 595862 ++++ filters/krita/tiff/kis_tiff_reader.h 2007/05/26 10:45:29 668416 +@@ -20,15 +20,15 @@ + #ifndef _KIS_TIFF_READER_H_ + #define _KIS_TIFF_READER_H_ + ++// On some platforms, tiffio.h #defines NULL in a bad ++// way for C++, as (void *)0 instead of using the correct ++// C++ value 0. Include stdio.h first to get the right one. ++#include <stdio.h> + #include <tiffio.h> + +-/*#include <stdio.h> +- +-#include <qvaluevector.h> +- +-#include <kio/job.h> +- +-#include <kis_progress_subject.h> */ ++// #include <qvaluevector.h> ++// #include <kio/job.h> ++// #include <kis_progress_subject.h> + + #include <kis_paint_device.h> + |