Files
haikuports/dev-libs/libgpg_error/patches/libgpg_error-1.32.patchset
2018-07-12 20:47:56 +00:00

71 lines
1.8 KiB
Plaintext

From 704f5695c327d67f550795e82004889717cf6ab9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 5 Aug 2014 16:25:46 +0000
Subject: haiku patch
diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
index ea58503..93cfef2 100644
--- a/src/mkerrcodes2.awk
+++ b/src/mkerrcodes2.awk
@@ -81,7 +81,7 @@ BEGIN {
/^#/ { next; }
header {
- if ($1 ~ /^[0123456789]+$/)
+ if ($1 ~ /^-?[0123456789]+$/)
{
print "static const int err_code_from_index[] = {";
header = 0;
--
1.8.3.4
From 148704497e457b5d82d2d6d4d338f971a273a001 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Wed, 17 Jan 2018 22:03:45 +0000
Subject: Do not use __GNUC_PATCHLEVEL__ if it's not defined.
diff --git a/doc/yat2m.c b/doc/yat2m.c
index a509d1b..21c1b2e 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -105,9 +105,14 @@
#if __GNUC__
+# ifdef __GNUC_PATCHLEVEL__
# define MY_GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
+# else
+# define MY_GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100)
+# endif
#else
# define MY_GCC_VERSION 0
#endif
diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in
index 8bcafcc..cd262e9 100644
--- a/src/gpg-error.h.in
+++ b/src/gpg-error.h.in
@@ -153,9 +153,14 @@ typedef unsigned int gpg_error_t;
* GCC feature test.
*/
#if __GNUC__
+# ifdef __GNUC_PATCHLEVEL__
# define _GPG_ERR_GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
+# else
+# define _GPG_ERR_GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100)
+# endif
#else
# define _GPG_ERR_GCC_VERSION 0
#endif
--
2.17.0