From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Sep 2013 19:16:30 +0000 (-0400)
Subject: Fix a warning related to SCMP_CMP definition in header.
X-Git-Tag: tor-0.2.5.1-alpha~39^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6ada1a50cbedebf15667b4448f6890140f56001;p=thirdparty%2Ftor.git

Fix a warning related to SCMP_CMP definition in header.

SCMP_CMP(a,b,c) leaves the fourth field of the structure undefined,
giving a missing-initializer error.  All of our uses are
three-argument, so I'm overriding the default.
---

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 1fd2119fa2..c6c93489c8 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -61,6 +61,9 @@ static sandbox_cfg_t *filter_dynamic = NULL;
 /** Holds a list of pre-recorded results from getaddrinfo().*/
 static sb_addr_info_t *sb_addr_info = NULL;
 
+#undef SCMP_CMP
+#define SCMP_CMP(a,b,c) ((struct scmp_arg_cmp){(a),(b),(c),0})
+
 /** Variable used for storing all syscall numbers that will be allowed with the
  * stage 1 general Tor sandbox.
  */