From 1ae9444fe8f22ad08a33d3ee6437fcae37d896a0 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Thu, 28 Dec 2017 22:07:49 -1000
Subject: [PATCH] Huge compile performance refactor

---
 include/kabufuda/Util.hpp   | 14 +++++++-------
 include/utf8proc.h          | 11 ++++++++++-
 lib/kabufuda/Card.cpp       |  4 ++--
 lib/kabufuda/Util.cpp       |  2 +-
 lib/kabufuda/winsupport.cpp |  6 +++---
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/include/kabufuda/Util.hpp b/include/kabufuda/Util.hpp
index decc451..a2c47e3 100644
--- a/include/kabufuda/Util.hpp
+++ b/include/kabufuda/Util.hpp
@@ -2,7 +2,7 @@
 #define __KABU_UTIL_HPP__
 
 #ifndef _WIN32
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
@@ -10,7 +10,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/statvfs.h>
-#include <errno.h>
+#include <cerrno>
 #else
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
@@ -19,19 +19,19 @@
 #define NOMINMAX
 #endif
 #include <Windows.h>
-#include <wchar.h>
+#include <cwchar>
 #include "winsupport.hpp"
 #if UNICODE
 #define CARD_UCS2 1
 #endif
 #endif
 
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
+#include <cstdarg>
+#include <cstdint>
+#include <cstdio>
 #include <algorithm>
 #include <string>
-#include <string.h>
+#include <cstring>
 #include "WideStringConvert.hpp"
 
 #undef bswap16
diff --git a/include/utf8proc.h b/include/utf8proc.h
index e6d09d7..6c3b993 100644
--- a/include/utf8proc.h
+++ b/include/utf8proc.h
@@ -97,8 +97,13 @@ enum {false, true};
 typedef bool utf8proc_bool;
 #  endif
 #else
+#ifdef __cplusplus
+#  include <cstdbool>
+#  include <cinttypes>
+#else
 #  include <stdbool.h>
 #  include <inttypes.h>
+#endif
 typedef int8_t utf8proc_int8_t;
 typedef uint8_t utf8proc_uint8_t;
 typedef int16_t utf8proc_int16_t;
@@ -109,7 +114,11 @@ typedef size_t utf8proc_size_t;
 typedef ssize_t utf8proc_ssize_t;
 typedef bool utf8proc_bool;
 #endif
-#include <limits.h>
+#ifdef __cplusplus
+#  include <climits>
+#else
+#  include <limits.h>
+#endif
 
 /** @name Error codes
  * Error codes being returned by almost all functions.
diff --git a/lib/kabufuda/Card.cpp b/lib/kabufuda/Card.cpp
index 13f7348..e536a7d 100644
--- a/lib/kabufuda/Card.cpp
+++ b/lib/kabufuda/Card.cpp
@@ -1,7 +1,7 @@
 #include "kabufuda/Card.hpp"
 #include "kabufuda/SRAM.hpp"
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <algorithm>
 #include <memory>
 
diff --git a/lib/kabufuda/Util.cpp b/lib/kabufuda/Util.cpp
index 00c4110..8cb0d69 100644
--- a/lib/kabufuda/Util.cpp
+++ b/lib/kabufuda/Util.cpp
@@ -1,5 +1,5 @@
 #include "kabufuda/Util.hpp"
-#include <time.h>
+#include <ctime>
 
 namespace kabufuda
 {
diff --git a/lib/kabufuda/winsupport.cpp b/lib/kabufuda/winsupport.cpp
index e004d9a..0fe195f 100644
--- a/lib/kabufuda/winsupport.cpp
+++ b/lib/kabufuda/winsupport.cpp
@@ -1,6 +1,6 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
 #include <string>
 #include "hecl/winsupport.hpp"