From 68e5fd9ebc8a3f510e3144e981a0cb358945fb9c Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 25 Jan 2012 16:12:53 +0100 Subject: Remove the 'macosx' arch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new atomic implementation chooses which header to include based on what #define's are set by the compiler (i.e. __x86_64__ or __i386__). Because of this, the qatomic_macosx.h header isn't used anymore. This also means that the configure script does not need to use or look for this file anymore, it should just use the normal uname -m detection. Change-Id: Ibf275488735483268286196952299c0e496dfd1f Reviewed-by: Morten Johan Sørvig Reviewed-by: Oswald Buddenhagen --- src/corelib/arch/arch.pri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/corelib/arch/arch.pri') diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index 2921f8edc5..e8699a27c6 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -4,7 +4,8 @@ win32:HEADERS += arch/qatomic_windows.h \ win32-g++*:HEADERS += arch/qatomic_i386.h \ arch/qatomic_x86_64.h -mac:HEADERS += arch/qatomic_macosx.h \ +mac:HEADERS += arch/qatomic_i386.h \ + arch/qatomic_x86_64.h \ arch/qatomic_generic.h vxworks:HEADERS += arch/qatomic_vxworks.h -- cgit v1.2.3