diff options
author | Stefan Radomski <github@mintwerk.de> | 2017-06-27 11:11:13 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-27 11:11:13 (GMT) |
commit | e24393f41834f116038faf6c6d5012575a67136a (patch) | |
tree | a1e83679e55781bc92849a07c5acda7b5c09908c /contrib/src/boost/predef/platform.h | |
parent | b3a2d91805feb81f79ee52c30a077521912b0bf9 (diff) | |
parent | 3a5692f40663282640775f8ff497c4860d265a2a (diff) | |
download | uscxml-e24393f41834f116038faf6c6d5012575a67136a.zip uscxml-e24393f41834f116038faf6c6d5012575a67136a.tar.gz uscxml-e24393f41834f116038faf6c6d5012575a67136a.tar.bz2 |
Merge pull request #149 from tklab-tud/sradomski
remerge
Diffstat (limited to 'contrib/src/boost/predef/platform.h')
-rw-r--r-- | contrib/src/boost/predef/platform.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/contrib/src/boost/predef/platform.h b/contrib/src/boost/predef/platform.h index 3843d0c..c0c8706 100644 --- a/contrib/src/boost/predef/platform.h +++ b/contrib/src/boost/predef/platform.h @@ -1,21 +1,21 @@ -/*
-Copyright Rene Rivera 2013-2015
-Copyright (c) Microsoft Corporation 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE_1_0.txt or copy at
-http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-#if !defined(BOOST_PREDEF_PLATFORM_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS)
-#ifndef BOOST_PREDEF_PLATFORM_H
-#define BOOST_PREDEF_PLATFORM_H
-#endif
-
-#include <boost/predef/platform/mingw.h>
-#include <boost/predef/platform/windows_desktop.h>
-#include <boost/predef/platform/windows_store.h>
-#include <boost/predef/platform/windows_phone.h>
-#include <boost/predef/platform/windows_runtime.h>
-/*#include <boost/predef/platform/.h>*/
-
-#endif
+/* +Copyright Rene Rivera 2013-2015 +Copyright (c) Microsoft Corporation 2014 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +#if !defined(BOOST_PREDEF_PLATFORM_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) +#ifndef BOOST_PREDEF_PLATFORM_H +#define BOOST_PREDEF_PLATFORM_H +#endif + +#include <boost/predef/platform/mingw.h> +#include <boost/predef/platform/windows_desktop.h> +#include <boost/predef/platform/windows_store.h> +#include <boost/predef/platform/windows_phone.h> +#include <boost/predef/platform/windows_runtime.h> +/*#include <boost/predef/platform/.h>*/ + +#endif |