[Commits] fd39f25: MariaRocks: fix compilation on Oracle Linux Server 7.3.

Sergei Petrunia psergey at askmonty.org
Fri Mar 10 13:05:17 EET 2017


revision-id: fd39f25ca70d548a4ec1ed36c4c6c30072d4e47b
parent(s): e19f1dd61e7cd59efca746a204ecf05648b21c48
committer: Sergei Petrunia
branch nick: 10.2-mariarocks
timestamp: 2017-03-10 14:05:17 +0300
message:

MariaRocks: fix compilation on Oracle Linux Server 7.3.

#define __STDC_FORMAT_MACROS. Unfortunately there is no single location
that would be #includ'ed before everything else. Have to put the #define
into each .cc file

---
 storage/rocksdb/ha_rocksdb.cc     | 3 +++
 storage/rocksdb/rdb_cf_manager.cc | 3 +++
 storage/rocksdb/rdb_datadic.cc    | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
index b681823..2a8d5f8 100644
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/storage/rocksdb/ha_rocksdb.cc
@@ -20,6 +20,9 @@
 
 #define MYSQL_SERVER 1
 
+/* For use of 'PRIu64': */
+#define __STDC_FORMAT_MACROS
+
 #include <my_config.h>
 
 #include <inttypes.h>
diff --git a/storage/rocksdb/rdb_cf_manager.cc b/storage/rocksdb/rdb_cf_manager.cc
index 710365a..22f60ef 100644
--- a/storage/rocksdb/rdb_cf_manager.cc
+++ b/storage/rocksdb/rdb_cf_manager.cc
@@ -18,6 +18,9 @@
 #pragma implementation // gcc: Class implementation
 #endif
 
+/* For use of 'PRIu64': */
+#define __STDC_FORMAT_MACROS
+
 #include <my_config.h>
 
 #include <inttypes.h>
diff --git a/storage/rocksdb/rdb_datadic.cc b/storage/rocksdb/rdb_datadic.cc
index 7922956..ba13b52 100644
--- a/storage/rocksdb/rdb_datadic.cc
+++ b/storage/rocksdb/rdb_datadic.cc
@@ -18,6 +18,9 @@
 #pragma implementation // gcc: Class implementation
 #endif
 
+/* For use of 'PRIu64': */
+#define __STDC_FORMAT_MACROS
+
 #include <my_config.h>
 /* This C++ file's header file */
 #include "./rdb_datadic.h"


More information about the commits mailing list