Skip to content

Commit 7ceb0b7

Browse files
committed
Merge #819: Enable -Wundef warning
e73ff30 Enable -Wundef warning (Tim Ruffing) Pull request description: ACKs for top commit: practicalswift: ACK e73ff30 -- patch looks correct sipa: ACK e73ff30 jonasnick: ACK e73ff30 Tree-SHA512: 1f0d477e41f33276eceb5324162731ba8aacd8d6571d7020344206b31c7f48c31f6bccbed2ce3ffe2e8c13abf98db24d177521b6b36a3087b81b55a253559fe6
2 parents 4ad408f + e73ff30 commit 7ceb0b7

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ esac
6767

6868
CFLAGS="-W $CFLAGS"
6969

70-
warn_CFLAGS="-std=c89 -pedantic -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wno-unused-function -Wno-long-long -Wno-overlength-strings"
70+
warn_CFLAGS="-std=c89 -pedantic -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef -Wno-unused-function -Wno-long-long -Wno-overlength-strings"
7171
saved_CFLAGS="$CFLAGS"
7272
CFLAGS="$warn_CFLAGS $CFLAGS"
7373
AC_MSG_CHECKING([if ${CC} supports ${warn_CFLAGS}])

src/valgrind_ctime_test.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
#include "assumptions.h"
1010
#include "util.h"
1111

12-
#if ENABLE_MODULE_ECDH
12+
#ifdef ENABLE_MODULE_ECDH
1313
# include "include/secp256k1_ecdh.h"
1414
#endif
1515

16-
#if ENABLE_MODULE_RECOVERY
16+
#ifdef ENABLE_MODULE_RECOVERY
1717
# include "include/secp256k1_recovery.h"
1818
#endif
1919

20-
#if ENABLE_MODULE_EXTRAKEYS
20+
#ifdef ENABLE_MODULE_EXTRAKEYS
2121
# include "include/secp256k1_extrakeys.h"
2222
#endif
2323

24-
#if ENABLE_MODULE_SCHNORRSIG
24+
#ifdef ENABLE_MODULE_SCHNORRSIG
2525
#include "include/secp256k1_schnorrsig.h"
2626
#endif
2727

@@ -37,11 +37,11 @@ int main(void) {
3737
unsigned char key[32];
3838
unsigned char sig[74];
3939
unsigned char spubkey[33];
40-
#if ENABLE_MODULE_RECOVERY
40+
#ifdef ENABLE_MODULE_RECOVERY
4141
secp256k1_ecdsa_recoverable_signature recoverable_signature;
4242
int recid;
4343
#endif
44-
#if ENABLE_MODULE_EXTRAKEYS
44+
#ifdef ENABLE_MODULE_EXTRAKEYS
4545
secp256k1_keypair keypair;
4646
#endif
4747

@@ -81,15 +81,15 @@ int main(void) {
8181
CHECK(ret);
8282
CHECK(secp256k1_ecdsa_signature_serialize_der(ctx, sig, &siglen, &signature));
8383

84-
#if ENABLE_MODULE_ECDH
84+
#ifdef ENABLE_MODULE_ECDH
8585
/* Test ECDH. */
8686
VALGRIND_MAKE_MEM_UNDEFINED(key, 32);
8787
ret = secp256k1_ecdh(ctx, msg, &pubkey, key, NULL, NULL);
8888
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret));
8989
CHECK(ret == 1);
9090
#endif
9191

92-
#if ENABLE_MODULE_RECOVERY
92+
#ifdef ENABLE_MODULE_RECOVERY
9393
/* Test signing a recoverable signature. */
9494
VALGRIND_MAKE_MEM_UNDEFINED(key, 32);
9595
ret = secp256k1_ecdsa_sign_recoverable(ctx, &recoverable_signature, msg, key, NULL, NULL);
@@ -129,7 +129,7 @@ int main(void) {
129129
CHECK(ret);
130130

131131
/* Test keypair_create and keypair_xonly_tweak_add. */
132-
#if ENABLE_MODULE_EXTRAKEYS
132+
#ifdef ENABLE_MODULE_EXTRAKEYS
133133
VALGRIND_MAKE_MEM_UNDEFINED(key, 32);
134134
ret = secp256k1_keypair_create(ctx, &keypair, key);
135135
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret));
@@ -142,7 +142,7 @@ int main(void) {
142142
CHECK(ret == 1);
143143
#endif
144144

145-
#if ENABLE_MODULE_SCHNORRSIG
145+
#ifdef ENABLE_MODULE_SCHNORRSIG
146146
VALGRIND_MAKE_MEM_UNDEFINED(key, 32);
147147
ret = secp256k1_keypair_create(ctx, &keypair, key);
148148
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret));

0 commit comments

Comments
 (0)