Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/suacomp/files: suacomp-0.6.14-strtoll.patch
Date: Sat, 29 Sep 2012 13:02:37
Message-Id: 20120929130223.2371321600@flycatcher.gentoo.org
1 grobian 12/09/29 13:02:22
2
3 Added: suacomp-0.6.14-strtoll.patch
4 Log:
5 Add patch for SUA 6.0, by David Holm, bug #435034
6
7 (Portage version: 2.2.01.21143-prefix/cvs/Darwin i386)
8
9 Revision Changes Path
10 1.1 sys-libs/suacomp/files/suacomp-0.6.14-strtoll.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/suacomp/files/suacomp-0.6.14-strtoll.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/suacomp/files/suacomp-0.6.14-strtoll.patch?rev=1.1&content-type=text/plain
14
15 Index: suacomp-0.6.14-strtoll.patch
16 ===================================================================
17 From a498772e5fe942eafe06ed62a00a21c4b99164b5 Mon Sep 17 00:00:00 2001
18 From: David Holm <dholmster@×××××.com>
19 Date: Fri, 14 Sep 2012 20:57:30 +0200
20 Subject: [PATCH] Fixes build issues on SUA 6.0
21
22 The prototypes for strto[u]ll.c in SUA 6.0 use C99 and are defined using (u_)quad_t. This will cause compilation to fail since there is a mismatch between stdlib.h and the implementation in suacomp. This change switches to the C99 definition and undefines strto[u]ll in case stdlib.h wants to map them to existing implementations.
23
24 https://sourceforge.net/p/suacomp/tickets/1/
25 ---
26 strtoll.c | 3 ++-
27 strtoull.c | 3 ++-
28 2 files changed, 4 insertions(+), 2 deletions(-)
29
30 diff --git a/strtoll.c b/strtoll.c
31 index 12f9886..c9e34b8 100644
32 --- a/strtoll.c
33 +++ b/strtoll.c
34 @@ -9,7 +9,8 @@
35 #include <unistd.h>
36 #include <stdlib.h>
37
38 -long long int strtoll(const char* nptr, char** endptr, int base) {
39 +#undef strtoll
40 +quad_t strtoll(const char* nptr, char** endptr, int base) {
41 long long int ret;
42 DT("enter: %p, %p, %d\n", nptr, endptr, base);
43
44 diff --git a/strtoull.c b/strtoull.c
45 index d0e0e67..622ee9b 100644
46 --- a/strtoull.c
47 +++ b/strtoull.c
48 @@ -9,7 +9,8 @@
49 #include <unistd.h>
50 #include <stdlib.h>
51
52 -long long int strtoull(const char* nptr, char** endptr, int base) {
53 +#undef strtoull
54 +u_quad_t strtoull(const char* nptr, char** endptr, int base) {
55 long long int ret;
56 DT("enter: %p, %p, %d\n", nptr, endptr, base);
57
58 --
59 1.7.6.1