From: Kris Katterjohn Date: Mon, 21 Jan 2019 22:33:32 +0000 (-0600) Subject: Fix a compiler warning on OpenBSD X-Git-Tag: tor-0.4.0.2-alpha~11^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4417ac880a7f1306574365fd9cf4da2a41ac14ef;p=thirdparty%2Ftor.git Fix a compiler warning on OpenBSD malloc_options needs to be declared extern (and declaring it extern means we need to initialize it separately) Fixes bug 29145; bugfix on 0.2.9.3-alpha Signed-off-by: Kris Katterjohn --- diff --git a/changes/bug29145 b/changes/bug29145 new file mode 100644 index 0000000000..40d3da4b91 --- /dev/null +++ b/changes/bug29145 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, testing): + - Silence a compiler warning in test-memwipe.c on OpenBSD. Fixes + bug 29145; bugfix on 0.2.9.3-alpha. Patch from Kris Katterjohn. diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index fd6457416a..c650b99c85 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -39,7 +39,8 @@ const char *s = NULL; #ifdef __OpenBSD__ /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ -const char *malloc_options="sufjj"; +extern const char *malloc_options; +const char *malloc_options = "sufjj"; #endif static unsigned