Attachment 48769 Details for Bug 38974 – patch

[patch] patch

0001-goo-gtypes.h-must-include-stdbool.h.patch (text/plain), 1.53 KB, created by Adrian Bunk on 2011-07-05 05:26:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Bunk

Created: 2011-07-05 05:26:19 UTC

Size: 1.53 KB

patch

obsolete

>From 6827aa2ebdf61e64aca0b0e518ecac7a58ea5cd3 Mon Sep 17 00:00:00 2001
>From: Adrian Bunk <bunk@stusta.de>
>Date: Tue, 5 Jul 2011 15:17:35 +0300
>Subject: goo/gtypes.h must #include <stdbool.h>
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Since commit ae79fc50 (Make GBool a bool instead of an int) this
>header uses "bool".
>
>This patch fixes the following build error I saw with xpdf in Debian:
>
><--  snip  -->
>
>...
>cc -g -O2 -march=core2 -I/usr/include/poppler -I/usr/include/poppler/goo -I/usr/include/poppler/splash -Wno-write-strings -DHAVE_DIRENT_H  -c -o build/parseargs.o build/parseargs.c
>In file included from build/parseargs.h:16:0,
>                 from build/parseargs.c:14:
>/usr/include/poppler/goo/gtypes.h:31:1: error: unknown type name âboolâ
>...
>
><--  snip  -->
>---
> goo/gtypes.h |    3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
>diff --git a/goo/gtypes.h b/goo/gtypes.h
>index b7a2dd2..828362e 100644
>--- a/goo/gtypes.h
>+++ b/goo/gtypes.h
>@@ -15,6 +15,7 @@
> //
> // Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
> // Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
>+// Copyright (C) 2011 Adrian Bunk <bunk@stusta.de>
> //
> // To see a description of the changes please see the Changelog file that
> // came with your tarball or type make ChangeLog if you are building from git
>@@ -24,6 +25,8 @@
> #ifndef GTYPES_H
> #define GTYPES_H
> 
>+#include <stdbool.h>
>+
> /*
>  * These have stupid names to avoid conflicts with some (but not all)
>  * C++ compilers which define them.
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 38974: 48769

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.