From 9d071d2a2cec9a7662a02669488569a017f0ea35 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Mon, 13 Feb 2017 21:25:04 -0700 Subject: 8.9 --- zen/build_info.h | 67 ++++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) mode change 100644 => 100755 zen/build_info.h (limited to 'zen/build_info.h') diff --git a/zen/build_info.h b/zen/build_info.h old mode 100644 new mode 100755 index 31c1d456..f3f7f5b1 --- a/zen/build_info.h +++ b/zen/build_info.h @@ -1,38 +1,29 @@ -// ***************************************************************************** -// * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * -// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * -// ***************************************************************************** - -#ifndef BUILD_INFO_H_5928539285603428657 -#define BUILD_INFO_H_5928539285603428657 - -namespace zen -{ -//determine build info: defines ZEN_BUILD_32BIT or ZEN_BUILD_64BIT - -#ifdef ZEN_WIN - #ifdef _WIN64 //_WIN32 is defined by the compiler for both 32 and 64 bit builds, unlike _WIN64 - #define ZEN_BUILD_64BIT - #else - #define ZEN_BUILD_32BIT - #endif - -#else - #ifdef __LP64__ - #define ZEN_BUILD_64BIT - #else - #define ZEN_BUILD_32BIT - #endif -#endif - -#ifdef ZEN_BUILD_32BIT - static_assert(sizeof(void*) == 4, ""); -#endif - -#ifdef ZEN_BUILD_64BIT - static_assert(sizeof(void*) == 8, ""); -#endif -} - -#endif //BUILD_INFO_H_5928539285603428657 +// ***************************************************************************** +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * +// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * +// ***************************************************************************** + +#ifndef BUILD_INFO_H_5928539285603428657 +#define BUILD_INFO_H_5928539285603428657 + +namespace zen +{ +//determine build info: defines ZEN_BUILD_32BIT or ZEN_BUILD_64BIT + + #ifdef __LP64__ + #define ZEN_BUILD_64BIT + #else + #define ZEN_BUILD_32BIT + #endif + +#ifdef ZEN_BUILD_32BIT + static_assert(sizeof(void*) == 4, ""); +#endif + +#ifdef ZEN_BUILD_64BIT + static_assert(sizeof(void*) == 8, ""); +#endif +} + +#endif //BUILD_INFO_H_5928539285603428657 -- cgit