fix versions.h stupidity

fdbbackup/backup.actor.cpp

@@ -63,9 +63,7 @@ using std::endl;
 #endif
 #endif
 
-#if defined(CMAKE_BUILD) || !defined(WIN32)
-#include "fdbclient/versions.h"
-#endif
+#include "fdbclient/IncludeVersions.h"
 
 #include "flow/SimpleOpt.h"
 #include "flow/actorcompiler.h"  // This must be the last #include.

fdbcli/fdbcli.actor.cpp

@@ -48,9 +48,7 @@
 #include "fdbcli/linenoise/linenoise.h"
 #endif
 
-#if defined(CMAKE_BUILD) || !defined(WIN32)
-#include "fdbclient/versions.h"
-#endif
+#include "fdbclient/IncludeVersions.h"
 
 #include "flow/actorcompiler.h"  // This must be the last #include.
 

fdbclient/IncludeVersions.h

@@ -0,0 +1,28 @@
+/*
+ * IncludeVersions.h
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2020 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This is a simple header to isolate the stupidity that results out of two
+// build systems and versions.h include directives
+
+#if defined(CMAKE_BUILD)
+#  include "fdbclient/versions.h"
+#elif !defined(WIN32)
+#  include "versions.h"
+#endif

fdbclient/NativeAPI.actor.cpp

@@ -48,9 +48,7 @@
 #include "flow/TLSConfig.actor.h"
 #include "flow/UnitTest.h"
 
-#if defined(CMAKE_BUILD) || !defined(WIN32)
-#include "fdbclient/versions.h"
-#endif
+#include "fdbclient/IncludeVersions.h"
 
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN

fdbclient/ThreadSafeTransaction.actor.cpp

@@ -21,10 +21,7 @@
 #include "fdbclient/ThreadSafeTransaction.h"
 #include "fdbclient/ReadYourWrites.h"
 #include "fdbclient/DatabaseContext.h"
-#if defined(CMAKE_BUILD) || !defined(WIN32)
-#include "fdbclient/versions.h"
-#endif
-#include <new>
+#include "fdbclient/IncludeVersions.h"
 
 // Users of ThreadSafeTransaction might share Reference<ThreadSafe...> between different threads as long as they don't call addRef (e.g. C API follows this).
 // Therefore, it is unsafe to call (explicitly or implicitly) this->addRef in any of these functions.

fdbmonitor/fdbmonitor.cpp

@@ -72,9 +72,7 @@
 #include "flow/SimpleOpt.h"
 #include "SimpleIni.h"
 
-#if defined(CMAKE_BUILD) || !defined(WIN32)
-#include "fdbclient/versions.h"
-#endif
+#include "fdbclient/IncludeVersions.h"
 
 #ifdef __linux__
 typedef fd_set* fdb_fd_set;

fdbserver/FDBExecHelper.actor.cpp

@@ -7,9 +7,7 @@
 #include "fdbserver/FDBExecHelper.actor.h"
 #include "flow/Trace.h"
 #include "flow/flow.h"
-#if defined(CMAKE_BUILD) || !defined(_WIN32)
-#include "fdbclient/versions.h"
-#endif
+#include "fdbclient/IncludeVersions.h"
 #include "fdbserver/Knobs.h"
 #include "flow/actorcompiler.h"  // This must be the last #include.
 

fdbserver/SimulatedCluster.actor.cpp

@@ -32,9 +32,7 @@
 #include "fdbclient/ManagementAPI.actor.h"
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/BackupAgent.actor.h"
-#if defined(CMAKE_BUILD) || !defined(WIN32)
-#include "fdbclient/versions.h"
-#endif
+#include "fdbclient/IncludeVersions.h"
 #include "flow/actorcompiler.h"  // This must be the last #include.
 
 #undef max

fdbserver/fdbserver.actor.cpp

@@ -55,9 +55,7 @@
 #include "fdbrpc/AsyncFileCached.actor.h"
 #include "fdbserver/CoroFlow.h"
 #include "flow/TLSConfig.actor.h"
-#if defined(CMAKE_BUILD) || !defined(WIN32)
-#include "fdbclient/versions.h"
-#endif
+#include "fdbclient/IncludeVersions.h"
 
 #include "fdbmonitor/SimpleIni.h"
 

fdbservice/FDBService.cpp

@@ -30,9 +30,7 @@
 
 #include "..\flow\SimpleOpt.h"
 #include "..\fdbmonitor\SimpleIni.h"
-#if defined(CMAKE_BUILD) || !defined(WIN32)
-#include "fdbclient/versions.h"
-#endif
+#include "fdbclient/IncludeVersions.h"
 
 // For PathFileExists
 #include "Shlwapi.h"