Skip to content

Commit 699a3d0

Browse files
juergenhoetzelsolardiz
authored andcommitted
Avoid the direct use of 'defined' in macro expansion
Fixes "-Wexpansion-to-defined" warnings produced by clang >=3.9. Closes openwall#4537
1 parent 863e693 commit 699a3d0

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

src/poly1305-donna/poly1305-donna.c

+17-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,23 @@
1111
#else
1212

1313
/* auto detect between 32bit / 64bit */
14-
#define HAS_SIZEOF_INT128_64BIT (defined(__SIZEOF_INT128__) && defined(__LP64__))
15-
#define HAS_MSVC_64BIT (defined(_MSC_VER) && defined(_M_X64))
16-
#define HAS_GCC_4_4_64BIT (defined(__GNUC__) && defined(__LP64__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4))))
14+
#if (defined(__SIZEOF_INT128__) && defined(__LP64__))
15+
#define HAS_SIZEOF_INT128_64BIT 1
16+
#else
17+
#define HAS_SIZEOF_INT128_64BIT 0
18+
#endif
19+
20+
#if (defined(_MSC_VER) && defined(_M_X64))
21+
#define HAS_MSVC_64BIT 1
22+
#else
23+
#define HAS_MSVC_64BIT 0
24+
#endif
25+
26+
#if (defined(__GNUC__) && defined(__LP64__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4))))
27+
#define HAS_GCC_4_4_64BIT 1
28+
#else
29+
#define HAS_GCC_4_4_64BIT 0
30+
#endif
1731

1832
#if (HAS_SIZEOF_INT128_64BIT || HAS_MSVC_64BIT || HAS_GCC_4_4_64BIT)
1933
#include "poly1305-donna-64.h"

0 commit comments

Comments
 (0)