ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move TargetPlatform.h to beast/Config.h

Browse Source
This commit is contained in:
Vinnie Falco
2013-09-19 09:00:48 -07:00
parent 11601bcccb
commit c733eb6e43
10 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/beast/Builds/VisualStudio2012/beast.vcxproj
View File

@@ -69,6 +69,7 @@
<None Include="..\..\README.md" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\beast\Config.h" />
<ClInclude Include="..\..\beast\intrusive\ForwardList.h" />
<ClInclude Include="..\..\beast\intrusive\PointerTraits.h" />
<ClInclude Include="..\..\beast\mpl.h" />
@@ -244,7 +245,6 @@
<ClInclude Include="..\..\modules\beast_core\system\PlatformDefs.h" />
<ClInclude Include="..\..\modules\beast_core\system\StandardHeader.h" />
<ClInclude Include="..\..\modules\beast_core\system\SystemStats.h" />
<ClInclude Include="..\..\modules\beast_core\system\TargetPlatform.h" />
<ClInclude Include="..\..\modules\beast_core\system\BeforeBoost.h" />
<ClInclude Include="..\..\modules\beast_core\system\BoostIncludes.h" />
<ClInclude Include="..\..\modules\beast_core\system\BoostPlaceholdersFix.h" />

6
src/beast/Builds/VisualStudio2012/beast.vcxproj.filters
View File

@@ -807,9 +807,6 @@
<ClInclude Include="..\..\modules\beast_core\system\SystemStats.h">
<Filter>beast_core\system</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\system\TargetPlatform.h">
<Filter>beast_core\system</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_core\containers\DynamicList.h">
<Filter>beast_core\containers</Filter>
</ClInclude>
@@ -1041,6 +1038,9 @@
<ClInclude Include="..\..\beast\net\IPEndpoint.h">
<Filter>beast\net</Filter>
</ClInclude>
<ClInclude Include="..\..\beast\Config.h">
<Filter>beast</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\modules\beast_core\containers\AbstractFifo.cpp">

6
src/beast/modules/beast_core/system/TargetPlatform.h → src/beast/beast/Config.h
View File

@@ -21,8 +21,10 @@
*/
//==============================================================================
#ifndef BEAST_CORE_TARGETPLATFORM_H_INCLUDED
#define BEAST_CORE_TARGETPLATFORM_H_INCLUDED
#ifndef BEAST_CONFIG_H_INCLUDED
#define BEAST_CONFIG_H_INCLUDED
// VFALCO NOTE this is analogous to <boost/config.hpp>
//==============================================================================
/* This file figures out which platform is being built, and defines some macros

2
src/beast/modules/beast_core/beast_core.h
View File

@@ -173,7 +173,7 @@ Some files contain portions of these external projects, licensed separately:
*/
// TargetPlatform.h should not use anything from BeastConfig.h
#include "system/TargetPlatform.h"
#include "../../beast/Config.h"
#include "system/BeastConfigCheck.h"
# include "system/BeforeBoost.h"

3
src/beast/modules/beast_core/native/BasicNativeHeaders.h
View File

@@ -24,7 +24,8 @@
#ifndef BEAST_BASICNATIVEHEADERS_H_INCLUDED
#define BEAST_BASICNATIVEHEADERS_H_INCLUDED
#include "../system/TargetPlatform.h"
#include "../../../beast/Config.h"
#undef T
//==============================================================================

2
src/beast/modules/beast_core/system/BeforeBoost.h
View File

@@ -21,7 +21,7 @@
#define BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED
// TargetPlatform.h should not use anything from BeastConfig.h
#include "TargetPlatform.h"
#include "../../../beast/Config.h"
#include "BeastConfigCheck.h"
// This file should be included before including any boost headers.

2
src/beast/modules/beast_sqlite/beast_sqlite.h
View File

@@ -30,7 +30,7 @@
see BeastConfig.h.
*/
#include "../beast_core/system/TargetPlatform.h"
#include "../../../beast/beast/Config.h"
#if BEAST_IOS || BEAST_MAC
# define BEAST_HAVE_NATIVE_SQLITE 1

2
src/ripple_hyperleveldb/ripple_hyperleveldb.h
View File

@@ -7,7 +7,7 @@
#ifndef RIPPLE_HYPERLEVELDB_RIPPLEHEADER
#define RIPPLE_HYPERLEVELDB_RIPPLEHEADER
#include "beast/modules/beast_core/system/TargetPlatform.h"
#include "beast/beast/Config.h"
#if ! BEAST_WIN32

2
src/ripple_leveldb/ripple_leveldb.cpp
View File

@@ -10,7 +10,7 @@
#include "ripple_leveldb.h"
#include "beast/modules/beast_core/system/TargetPlatform.h"
#include "beast/beast/Config.h"
// Set the appropriate LevelDB platform macro based on our platform.
//

2
src/ripple_mdb/ripple_mdb.h
View File

@@ -7,7 +7,7 @@
#ifndef RIPPLE_MDB_H_INCLUDED
#define RIPPLE_MDB_H_INCLUDED
#include "beast/modules/beast_core/system/TargetPlatform.h"
#include "beast/beast/Config.h"
#if ! BEAST_WIN32
#define RIPPLE_MDB_AVAILABLE 1