Attachment 132722 Details for Bug 101810 – define BOOLEAN depending on ENABLE_LIBPNG

[patch] define BOOLEAN depending on ENABLE_LIBPNG

0002-define-HAVE_BOOLEAN-if-ENABLE_LIBPNG-is-additionally.patch (text/plain), 1.07 KB, created by Jannick on 2017-07-16 21:13:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jannick

Created: 2017-07-16 21:13:49 UTC

Size: 1.07 KB

patch

obsolete

>From 5755a2ad8eb37d42e38ee0c20e4c4afc37365e82 Mon Sep 17 00:00:00 2001
>From: Jannick <thirdedition@gmx.net>
>Date: Sun, 16 Jul 2017 19:53:21 +0200
>Subject: [PATCH 2/6] #define HAVE_BOOLEAN if ENABLE_LIBPNG is additionally
> defined
>
>---
> config.h.cmake       | 5 ++++-
> poppler/DCTStream.cc | 1 +
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/config.h.cmake b/config.h.cmake
>index 4a4da62..ea5e5a8 100644
>--- a/config.h.cmake
>+++ b/config.h.cmake
>@@ -230,7 +230,10 @@
>  * headers and I'm too lazy to write a configure test as long as only
>  * unixware is related
>  */
>-#ifdef _UNIXWARE
>+#if defined( _UNIXWARE ) || defined( ENABLE_LIBPNG )
>+#ifdef HAVE_BOOLEAN
>+	#undef HAVE_BOOLEAN
>+#endif
> #define HAVE_BOOLEAN
> #endif
> 
>diff --git a/poppler/DCTStream.cc b/poppler/DCTStream.cc
>index bfdb0ea..32b5305 100644
>--- a/poppler/DCTStream.cc
>+++ b/poppler/DCTStream.cc
>@@ -14,6 +14,7 @@
> //
> //========================================================================
> 
>+#include <config.h>
> #include "DCTStream.h"
> 
> static void str_init_source(j_decompress_ptr cinfo)
>-- 
>2.7.1.windows.2
>

Actions: View | Splinter Review

Attachments on bug 101810: 132722

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.