From fd39f25ca70d548a4ec1ed36c4c6c30072d4e47b Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Fri, 10 Mar 2017 14:05:17 +0300 Subject: [PATCH] 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 b6818234fad..2a8d5f8513c 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 #include diff --git a/storage/rocksdb/rdb_cf_manager.cc b/storage/rocksdb/rdb_cf_manager.cc index 710365a0b25..22f60ef3e61 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 #include diff --git a/storage/rocksdb/rdb_datadic.cc b/storage/rocksdb/rdb_datadic.cc index 79229561939..ba13b52f1b4 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 /* This C++ file's header file */ #include "./rdb_datadic.h"