mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firebird: gcc6 compatibility part 1

Browse Source 
Change-Id: I4fbb131a629275626510d5311550e8bf8cdef6d5
This commit is contained in:
Lionel Elie Mamane
2016-08-17 19:21:14 +02:00
parent 5dad45d798
commit 31b13ed9ef
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/firebird/UnpackedTarball_firebird.mk vendored
View File

@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-Engine12.patch \ external/firebird/firebird-Engine12.patch \
external/firebird/firebird-rpath.patch.0 \ external/firebird/firebird-rpath.patch.0 \
external/firebird/firebird-cloop-compiler.patch.1 \ external/firebird/firebird-cloop-compiler.patch.1 \
external/firebird/firebird-gcc6.patch.1 \
)) ))
ifeq ($(OS)-$(COM),WNT-MSC) ifeq ($(OS)-$(COM),WNT-MSC)

19
external/firebird/firebird-gcc6.patch.1 vendored Normal file
View File

@@ -0,0 +1,19 @@
commit 3618aa2171674babf79ef935aa049c40a3db1321
Author: asfernandes <asfernandes@users.sourceforge.net>
Date: Sat Mar 5 03:39:36 2016 +0000
Make the generated code compatible with gcc 6 in C++-14 mode.
diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
index 2af96c6..2dcffd6 100644
--- a/src/gpre/c_cxx.cpp
+++ b/src/gpre/c_cxx.cpp
@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request)
printa(0, "static %sshort\n isc_%dl = %d;",
(request->req_flags & REQ_extend_dpb) ? "" : CONST_STR,
request->req_ident, request->req_length);
- printa(0, "static %schar\n isc_%d [] = {", CONST_STR, request->req_ident);
+ printa(0, "static %sunsigned char\n isc_%d [] = {", CONST_STR, request->req_ident);
const TEXT* string_type = "blr";
if (gpreGlob.sw_raw)