Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

geany-plugins: fix compilation #33573

Merged
merged 1 commit into from
Oct 16, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions srcpkgs/geany-plugins/patches/pr-1053.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
From ad50d3ed2ddfe11cd07954786b96725602fb4ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=2E=20R=C3=B8dseth?= <rodseth@gmail.com>
Date: Tue, 5 Jan 2021 12:57:27 +0100
Subject: [PATCH] Use stdbool.h istead of redefining bool

Redefining bool causes errors when used together with ie. GCC 10.2.0
---
pretty-printer/src/PrettyPrinter.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pretty-printer/src/PrettyPrinter.h b/pretty-printer/src/PrettyPrinter.h
index 268986e95..4200db612 100644
--- a/pretty-printer/src/PrettyPrinter.h
+++ b/pretty-printer/src/PrettyPrinter.h
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
+#include <stdbool.h>

#ifdef HAVE_GLIB
#include <glib.h>
@@ -52,15 +53,13 @@
#define TRUE !(FALSE)
#endif

-typedef unsigned int bool;
-
/*========================================== STRUCTURES =======================================================*/

/**
* The PrettyPrintingOptions struct allows the programmer to tell the
* PrettyPrinter how it must format the XML output.
*/
-typedef struct
+typedef struct
{
const char* newLineChars; /* char used to generate a new line (generally \r\n) */
char indentChar; /* char used for indentation */