From d036668ffa0a16ad2c1ccb662a0c419c2f06b827 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Fri, 24 Aug 2018 15:19:40 +0300
Subject: [PATCH] MXS-2011 Rename blr.h to blr.hh

Now contains C++ elements.
---
 server/modules/routing/binlogrouter/blr.cc             | 2 +-
 server/modules/routing/binlogrouter/{blr.h => blr.hh}  | 2 +-
 server/modules/routing/binlogrouter/blr_cache.cc       | 2 +-
 server/modules/routing/binlogrouter/blr_event.cc       | 2 +-
 server/modules/routing/binlogrouter/blr_file.cc        | 2 +-
 server/modules/routing/binlogrouter/blr_master.cc      | 2 +-
 server/modules/routing/binlogrouter/blr_slave.cc       | 2 +-
 server/modules/routing/binlogrouter/maxbinlogcheck.cc  | 2 +-
 server/modules/routing/binlogrouter/test/testbinlog.cc | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename server/modules/routing/binlogrouter/{blr.h => blr.hh} (99%)

diff --git a/server/modules/routing/binlogrouter/blr.cc b/server/modules/routing/binlogrouter/blr.cc
index 99cc14767..d1b2cfc46 100644
--- a/server/modules/routing/binlogrouter/blr.cc
+++ b/server/modules/routing/binlogrouter/blr.cc
@@ -24,7 +24,7 @@
  * should not be considered production ready.
  */
 
-#include "blr.h"
+#include "blr.hh"
 
 #include <ctype.h>
 #include <ini.h>
diff --git a/server/modules/routing/binlogrouter/blr.h b/server/modules/routing/binlogrouter/blr.hh
similarity index 99%
rename from server/modules/routing/binlogrouter/blr.h
rename to server/modules/routing/binlogrouter/blr.hh
index 0eadbc543..ae1546b67 100644
--- a/server/modules/routing/binlogrouter/blr.h
+++ b/server/modules/routing/binlogrouter/blr.hh
@@ -20,7 +20,7 @@
 
 #define MXS_MODULE_NAME "binlogrouter"
 
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
 
 #include <openssl/aes.h>
 #include <pthread.h>
diff --git a/server/modules/routing/binlogrouter/blr_cache.cc b/server/modules/routing/binlogrouter/blr_cache.cc
index 40aa1e659..89280fb3a 100644
--- a/server/modules/routing/binlogrouter/blr_cache.cc
+++ b/server/modules/routing/binlogrouter/blr_cache.cc
@@ -24,7 +24,7 @@
  * should not be considered production ready.
  */
 
-#include "blr.h"
+#include "blr.hh"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/modules/routing/binlogrouter/blr_event.cc b/server/modules/routing/binlogrouter/blr_event.cc
index c2956df5e..379dea8fe 100644
--- a/server/modules/routing/binlogrouter/blr_event.cc
+++ b/server/modules/routing/binlogrouter/blr_event.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "blr.h"
+#include "blr.hh"
 
 #include <inttypes.h>
 
diff --git a/server/modules/routing/binlogrouter/blr_file.cc b/server/modules/routing/binlogrouter/blr_file.cc
index a7a81ca4e..526166554 100644
--- a/server/modules/routing/binlogrouter/blr_file.cc
+++ b/server/modules/routing/binlogrouter/blr_file.cc
@@ -15,7 +15,7 @@
  * @file blr_file.c - contains code for the router binlog file management
  */
 
-#include "blr.h"
+#include "blr.hh"
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/server/modules/routing/binlogrouter/blr_master.cc b/server/modules/routing/binlogrouter/blr_master.cc
index d8a338d00..8650792e9 100644
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@@ -27,7 +27,7 @@
  * should not be considered production ready.
  */
 
-#include "blr.h"
+#include "blr.hh"
 
 #include <inttypes.h>
 #include <stdio.h>
diff --git a/server/modules/routing/binlogrouter/blr_slave.cc b/server/modules/routing/binlogrouter/blr_slave.cc
index 43731ac06..050fdecad 100644
--- a/server/modules/routing/binlogrouter/blr_slave.cc
+++ b/server/modules/routing/binlogrouter/blr_slave.cc
@@ -24,7 +24,7 @@
  * should not be considered production ready.
  */
 
-#include "blr.h"
+#include "blr.hh"
 
 #include <errno.h>
 #include <inttypes.h>
diff --git a/server/modules/routing/binlogrouter/maxbinlogcheck.cc b/server/modules/routing/binlogrouter/maxbinlogcheck.cc
index d13689da5..379957599 100644
--- a/server/modules/routing/binlogrouter/maxbinlogcheck.cc
+++ b/server/modules/routing/binlogrouter/maxbinlogcheck.cc
@@ -19,7 +19,7 @@
  * It suggests the pos the file should be trucatetd at.
  */
 
-#include "blr.h"
+#include "blr.hh"
 
 #include <getopt.h>
 #include <stdio.h>
diff --git a/server/modules/routing/binlogrouter/test/testbinlog.cc b/server/modules/routing/binlogrouter/test/testbinlog.cc
index da537ef21..8a044eeea 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@@ -22,7 +22,7 @@
  * @endverbatim
  */
 
-#include "../blr.h"
+#include "../blr.hh"
 
 #include <stdio.h>
 #include <stdlib.h>