Merge branch 'pan/binary_match_scope/OTP-9701'

* pan/binary_match_scope/OTP-9701:
  Remove remaining gcc 4.6 assigned-but-not-used warnings from erts
  Remove GCC 4.6 set-but-not-used warning from erl_bif_binary
  Make binary:match with scope return correct values

1 files changed, 12 insertions, 2 deletions

diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c
index 49750ff6ce..db2854fa40 100644
--- a/erts/emulator/sys/common/erl_mseg.c
+++ b/erts/emulator/sys/common/erl_mseg.c
@@ -371,20 +371,30 @@ mseg_create(ErtsMsegAllctr_t *ma, MemKind* mk, Uint size)
 static ERTS_INLINE void
 mseg_destroy(ErtsMsegAllctr_t *ma, MemKind* mk, void *seg, Uint size)
 {
+#ifdef DEBUG
     int res;
+#endif
 
 #if HALFWORD_HEAP
     if (mk == &ma->low_mem) {
-	res = pmunmap((void *) seg, size);
+#ifdef DEBUG
+	res = 
+#endif
+	    pmunmap((void *) seg, size);
     }
     else
 #endif
     {
 #ifdef ERTS_MSEG_FAKE_SEGMENTS
 	erts_sys_free(ERTS_ALC_N_INVALID, NULL, seg);
+#ifdef DEBUG
 	res = 0;
+#endif
 #elif HAVE_MMAP
-	res = munmap((void *) seg, size);
+#ifdef DEBUG
+	res = 
+#endif
+	    munmap((void *) seg, size);
 #else
 # error "Missing mseg_destroy() implementation"
 #endif