vpnor: Shuffle and rework includes for sanity
Include ordering and whether or not C linkage is forced by `extern "C"`
blocks can cause headaches at link time. Ensure that all C dependencies
are included in an `extern C` block before other includes occur. Also
include the C++ versions of string.h and assert.h
Change-Id: Ia96f6044d40c8eccb907b65924efcf62ac7a89c3
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
diff --git a/vpnor/test/write_toc.cpp b/vpnor/test/write_toc.cpp
index dcf5aae..6f6b101 100644
--- a/vpnor/test/write_toc.cpp
+++ b/vpnor/test/write_toc.cpp
@@ -4,10 +4,11 @@
#include "vpnor/pnor_partition_table.hpp"
-#include <assert.h>
-#include <string.h>
#include <sys/mman.h>
+#include <cassert>
+#include <cstring>
+
extern "C" {
#include "test/mbox.h"
#include "test/system.h"