From 327d7a65242c6bda3330a507f75f1700f9298305 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Thu, 19 Sep 2013 03:49:52 -0700
Subject: [PATCH] Fixes for consolidated beast unity includes

---
 modules/beast_core/beast_core.cpp                        | 9 ---------
 .../beast_core/zip/beast_GZIPDecompressorInputStream.cpp | 1 +
 modules/beast_sqdb/source/error_codes.cpp                | 4 ++++
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/modules/beast_core/beast_core.cpp b/modules/beast_core/beast_core.cpp
index 9613d534b6..a167c4d98f 100644
--- a/modules/beast_core/beast_core.cpp
+++ b/modules/beast_core/beast_core.cpp
@@ -21,15 +21,6 @@
 */
 //==============================================================================
 
-#if defined BEAST_CORE_H_INCLUDED
- /* When you add this cpp file to your project, you mustn't include it in a file where you've
-    already included any other headers - just put it inside a file on its own, possibly with your config
-    flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
-    header files that the compiler may be using.
- */
- #error "Incorrect use of BEAST cpp file"
-#endif
-
 // Your project must contain a BeastConfig.h file with your project-specific settings in it,
 // and your header search path must make it accessible to the module's files.
 #include "BeastConfig.h"
diff --git a/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp b/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp
index bc70e9b43c..9255b4fae0 100644
--- a/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp
+++ b/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp
@@ -66,6 +66,7 @@ namespace zlibNamespace
   #undef Byte
   #undef fdopen
   #undef local
+  #undef Code
 
   #if BEAST_CLANG
    #pragma clang diagnostic pop
diff --git a/modules/beast_sqdb/source/error_codes.cpp b/modules/beast_sqdb/source/error_codes.cpp
index 58420f0727..e62110002b 100644
--- a/modules/beast_sqdb/source/error_codes.cpp
+++ b/modules/beast_sqdb/source/error_codes.cpp
@@ -63,6 +63,10 @@ namespace sqdb
 namespace detail
 {
 
+#ifdef c
+#undef c
+#endif
+
 const Error sqliteError(const char* sourceFileName,
                         int lineNumber,
                         int sqliteErrorCode)