From ec6980da960910ddacc676575fe3d4743b8f7c59 Mon Sep 17 00:00:00 2001
From: John Hood <cgull@glup.org>
Date: Mon, 9 May 2016 23:26:20 -0400
Subject: [PATCH] GCC 6 fixes.

Should resolve https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811579

Resolves #719.
---
 src/protobufs/Makefile.am    | 2 +-
 src/tests/encrypt-decrypt.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/protobufs/Makefile.am b/src/protobufs/Makefile.am
index 131ec4e..13fdce8 100644
--- a/src/protobufs/Makefile.am
+++ b/src/protobufs/Makefile.am
@@ -1,7 +1,7 @@
 source = userinput.proto hostinput.proto transportinstruction.proto
 
 AM_CPPFLAGS = $(protobuf_CFLAGS)
-AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
+AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) -Wno-error
 
 SUFFIXES = .proto .pb.cc
 
diff --git a/src/tests/encrypt-decrypt.cc b/src/tests/encrypt-decrypt.cc
index 179a6c0..b01e348 100644
--- a/src/tests/encrypt-decrypt.cc
+++ b/src/tests/encrypt-decrypt.cc
@@ -54,7 +54,7 @@ const size_t NUM_SESSIONS         = 64;
 
 bool verbose = false;
 
-#define NONCE_FMT "%016"PRIx64
+#define NONCE_FMT "%016" PRIx64
 
 static std::string random_payload( void ) {
   const size_t len = prng.uint32() % MESSAGE_SIZE_MAX;