From 72d8fa64b3fa01ce942913dcb71bdf0eb14621c5 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 14 Dec 2012 23:24:55 +0100 Subject: [PATCH] Fixed redefinition error if user define x64 Former-commit-id: 51e0c888132a8651a07d22b86ecc95cc487537d3 --- include/Nazara/Prerequesites.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/Nazara/Prerequesites.hpp b/include/Nazara/Prerequesites.hpp index 134f8b208..d108c7f8c 100644 --- a/include/Nazara/Prerequesites.hpp +++ b/include/Nazara/Prerequesites.hpp @@ -144,8 +144,8 @@ #define NAZARA_API #endif -#if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || defined(__ia64__) || defined(__ia64) || \ - defined(_M_IA64) || defined(__itanium__) || defined(__MINGW64__) +#if !defined(NAZARA_PLATFORM_x64) && (defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || defined(__ia64__) || defined(__ia64) || \ + defined(_M_IA64) || defined(__itanium__) || defined(__MINGW64__)) #define NAZARA_PLATFORM_x64 #endif