1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
Last-Update: 2014-10-16
Forwarded: yes
Bug-Upstream: http://bugs.mysql.com/bug.php?id=74241
From: Marcin Szalowicz <marcin.szalowicz@oracle.com>
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: fix FTBFS multiple architectures [kfreebsd, hurd, ppc64el, s390x].
--- a/backend/wbpublic/grtsqlparser/mysql_parser_services.h
+++ b/backend/wbpublic/grtsqlparser/mysql_parser_services.h
@@ -23,11 +23,9 @@
#include "mysql-parser-common.h"
#include "grtdb/db_helpers.h"
-#ifdef __linux__
- #include "grts/structs.db.mysql.h"
-#endif
+#include "grts/structs.db.mysql.h"
class MySQLRecognizer;
class MySQLSyntaxChecker;
class MySQLScanner;
--- a/backend/wbprivate/sqlide/execute_routine_wizard.h
+++ b/backend/wbprivate/sqlide/execute_routine_wizard.h
@@ -20,11 +20,9 @@
#pragma once
#include "mforms/form.h"
-#ifdef __linux__
#include "grts/structs.db.mysql.h"
-#endif
namespace mforms {
class Button;
class TextEntry;
--- a/modules/db.mysql.parser/src/mysql_parser_module.h
+++ b/modules/db.mysql.parser/src/mysql_parser_module.h
@@ -31,12 +31,10 @@
#include "grtpp_module_cpp.h"
#include "grtsqlparser/mysql_parser_services.h"
-#ifdef __linux__
#include "grts/structs.db.mysql.h"
#include "grts/structs.wrapper.h"
-#endif
#define DOC_MYSQLPARSERSERVICESIMPL \
"Parsing services for MySQL.\n"\
"\n"\
--- a/library/grt/src/grtpp.h
+++ b/library/grt/src/grtpp.h
@@ -551,9 +551,9 @@
#endif
#else
#define DEFINE_SSIZE_T_FUNCTIONS
- #ifdef __x86_64__
+ #if __LP64__
#define DEFINE_INT_FUNCTIONS
#endif
#ifdef __APPLE__
|
