Merge branch 'pan/fix-compiler-warnings-clang-and-new-gcc'

* pan/fix-compiler-warnings-clang-and-new-gcc:
  Fix compiler warnings from GCC 4.7.1 on ARCH Linux
  Fix clang compiler warnings on FreeBSD in erts

1 files changed, 6 insertions, 1 deletions

diff --git a/erts/emulator/beam/export.c b/erts/emulator/beam/export.c
index af1fd35831..b0f08d8245 100644
--- a/erts/emulator/beam/export.c
+++ b/erts/emulator/beam/export.c
@@ -383,7 +383,9 @@ void export_start_staging(void)
     IndexTable* dst = &export_tables[dst_ix];
     IndexTable* src = &export_tables[src_ix];
     struct export_entry* src_entry;
+#ifdef DEBUG
     struct export_entry* dst_entry;
+#endif
     int i;
 
     ASSERT(dst_ix != src_ix);
@@ -396,7 +398,10 @@ void export_start_staging(void)
     for (i = 0; i < src->entries; i++) {
 	src_entry = (struct export_entry*) erts_index_lookup(src, i);
         src_entry->ep->addressv[dst_ix] = src_entry->ep->addressv[src_ix];
-	dst_entry = (struct export_entry*) index_put_entry(dst, src_entry);
+#ifdef DEBUG
+	dst_entry = (struct export_entry*) 
+#endif
+	    index_put_entry(dst, src_entry);
 	ASSERT(entry_to_blob(src_entry) == entry_to_blob(dst_entry));
     }
     export_staging_unlock();