summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-02-23 11:33:07 -0500
committerNick Mathewson <nickm@torproject.org>2015-02-23 11:33:07 -0500
commit7a1a0a4cd7d8ccdc5c9a327762f736a4e8d0d6a9 (patch)
treeedbd83c636e0f19f6818325319d8b0f0c050f468
parentcf7aa7b9260b4f62447998ce243221d34e15abad (diff)
parentaeb38bbdce427edacd0fa40069290063cb4dfe19 (diff)
downloadtor-7a1a0a4cd7d8ccdc5c9a327762f736a4e8d0d6a9.tar.gz
tor-7a1a0a4cd7d8ccdc5c9a327762f736a4e8d0d6a9.zip
Merge remote-tracking branch 'public/bug14988_025'
-rw-r--r--changes/bug149884
-rw-r--r--src/common/backtrace.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug14988 b/changes/bug14988
new file mode 100644
index 0000000000..67dc96e443
--- /dev/null
+++ b/changes/bug14988
@@ -0,0 +1,4 @@
+ o Minor bugfixes (compilation):
+ - Fix a compilation warning on s390. Fixes bug 14988; bugfix on
+ 0.2.5.2-alpha.
+
diff --git a/src/common/backtrace.c b/src/common/backtrace.c
index 1033c7e5de..a2d5378b20 100644
--- a/src/common/backtrace.c
+++ b/src/common/backtrace.c
@@ -80,6 +80,7 @@ clean_backtrace(void **stack, int depth, const ucontext_t *ctx)
#else
(void) depth;
(void) ctx;
+ (void) stack;
#endif
}