Attachment #337532 for bug #454916

View | Details | Raw Unified | Return to bug 454916
Collapse All | Expand All




   #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32
#endif

#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
namespace Botan {

extern "C" {


}

#if defined(Q_OS_WIN) || !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
#if (BOTAN_MP_WORD_BITS == 8)
  typedef Botan::u16bit dword;
#elif (BOTAN_MP_WORD_BITS == 16)


extern "C" {

#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
/*
* Helper Macros for x86 Assembly
*/

Lines 66-72 Link Here

(-)qt-creator-2.6.1-src/src/libs/3rdparty/botan/botan.h (-1 / +1 lines)
66	#endif	66	#endif
67		67
68	#define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN	68	#define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN
69	#define BOTAN_TARGET_CPU_IS_X86_FAMILY	69	//#define BOTAN_TARGET_CPU_IS_X86_FAMILY
70	#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1	70	#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1
71		71
72	#if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) \|\| \	72	#if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) \|\| \

Return to bug 454916

Lines 1103-1109 Link Here

(-)qt-creator-2.6.1-src/src/libs/3rdparty/botan/botan.cpp (-3 / +3 lines)
1103	#error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32	1103	#error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32
1104	#endif	1104	#endif
1105		1105
1106	#ifdef Q_OS_UNIX	1106	#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
1107	namespace Botan {	1107	namespace Botan {
1108		1108
1109	extern "C" {	1109	extern "C" {
Lines 1689-1695 Link Here
1689		1689
1690	}	1690	}
1691		1691
1692	#ifdef Q_OS_WIN	1692	#if defined(Q_OS_WIN) \|\| !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
1693	#if (BOTAN_MP_WORD_BITS == 8)	1693	#if (BOTAN_MP_WORD_BITS == 8)
1694	typedef Botan::u16bit dword;	1694	typedef Botan::u16bit dword;
1695	#elif (BOTAN_MP_WORD_BITS == 16)	1695	#elif (BOTAN_MP_WORD_BITS == 16)
Lines 2315-2321 Link Here
2315		2315
2316	extern "C" {	2316	extern "C" {
2317		2317
2318	#ifdef Q_OS_UNIX	2318	#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
2319	/*	2319	/*
2320	* Helper Macros for x86 Assembly	2320	* Helper Macros for x86 Assembly
2321	*/	2321	*/