From 535ed69d33072543b543829b86409758cc7f6318 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Sun, 22 Jan 2017 21:55:01 -0800
Subject: change preproc syntax for C strings

---
 tools/preproc/c_file.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools/preproc/c_file.h')

diff --git a/tools/preproc/c_file.h b/tools/preproc/c_file.h
index b6041cc00..1a2573839 100644
--- a/tools/preproc/c_file.h
+++ b/tools/preproc/c_file.h
@@ -42,6 +42,10 @@ private:
     long m_lineNum;
     std::string m_filename;
 
+    bool ConsumeHorizontalWhitespace();
+    bool ConsumeNewline();
+    void SkipWhitespace();
+    void TryConvertString();
     void ReportDiagnostic(const char* type, const char* format, std::va_list args);
     void RaiseError(const char* format, ...);
     void RaiseWarning(const char* format, ...);
-- 
cgit v1.2.3


From c8542506580c0fa247bbb44c169a2cb1244577e4 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Mon, 23 Jan 2017 16:34:20 -0800
Subject: preproc incbins

---
 tools/preproc/c_file.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools/preproc/c_file.h')

diff --git a/tools/preproc/c_file.h b/tools/preproc/c_file.h
index 1a2573839..ddd57fd84 100644
--- a/tools/preproc/c_file.h
+++ b/tools/preproc/c_file.h
@@ -24,6 +24,7 @@
 #include <cstdarg>
 #include <cstdint>
 #include <string>
+#include <memory>
 #include "preproc.h"
 
 class CFile
@@ -46,6 +47,9 @@ private:
     bool ConsumeNewline();
     void SkipWhitespace();
     void TryConvertString();
+    std::unique_ptr<unsigned char[]> CFile::ReadWholeFile(const std::string& path, int& size);
+    bool CheckIdentifier(const std::string& ident);
+    void TryConvertIncbin();
     void ReportDiagnostic(const char* type, const char* format, std::va_list args);
     void RaiseError(const char* format, ...);
     void RaiseWarning(const char* format, ...);
-- 
cgit v1.2.3


From 3f2ea6a1f076575d0c61ca0b71917704e38f6dd7 Mon Sep 17 00:00:00 2001
From: Cameron Hall <camthesaxman@users.noreply.github.com>
Date: Tue, 24 Jan 2017 19:50:28 -0600
Subject: make preproc build under GCC (#215)

---
 tools/preproc/c_file.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/preproc/c_file.h')

diff --git a/tools/preproc/c_file.h b/tools/preproc/c_file.h
index ddd57fd84..7369aba85 100644
--- a/tools/preproc/c_file.h
+++ b/tools/preproc/c_file.h
@@ -47,7 +47,7 @@ private:
     bool ConsumeNewline();
     void SkipWhitespace();
     void TryConvertString();
-    std::unique_ptr<unsigned char[]> CFile::ReadWholeFile(const std::string& path, int& size);
+    std::unique_ptr<unsigned char[]> ReadWholeFile(const std::string& path, int& size);
     bool CheckIdentifier(const std::string& ident);
     void TryConvertIncbin();
     void ReportDiagnostic(const char* type, const char* format, std::va_list args);
-- 
cgit v1.2.3