From eb4c04e1978f8f217e24d46a3baeecf54ac23096 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Tue, 8 Dec 2015 20:01:30 -0500
Subject: internal headers: consolidate perk_impl.h and perk_driver_impl.h.

---
 src/internal/perk_driver_impl.h | 26 ++++++++++++++++++++++++++
 src/internal/perk_impl.h        | 30 ------------------------------
 2 files changed, 26 insertions(+), 30 deletions(-)
 delete mode 100644 src/internal/perk_impl.h

(limited to 'src/internal')

diff --git a/src/internal/perk_driver_impl.h b/src/internal/perk_driver_impl.h
index 016a369..681cd3c 100644
--- a/src/internal/perk_driver_impl.h
+++ b/src/internal/perk_driver_impl.h
@@ -1,6 +1,13 @@
 #ifndef PE_DRIVER_IMPL_H
 #define PE_DRIVER_IMPL_H
 
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+#include <perk/perk.h>
+#include <perk/perk_meta.h>
+
 enum app_tags {
 	TAG_HELP,
 	TAG_VERSION,
@@ -11,4 +18,23 @@ enum app_tags {
 	TAG_IMPSYMS,
 };
 
+struct pe_driver_ctx_impl {
+	struct pe_symbol_ctx	symctx;
+	struct pe_output_ctx	outctx;
+	struct pe_linker_ctx	lnkctx;
+	struct pe_server_ctx	srvctx;
+	struct pe_io_ctx	ioctx;
+	struct pe_common_ctx	cctx;
+	struct pe_driver_ctx	ctx;
+};
+
+struct pe_unit_ctx_impl {
+	const char *		path;
+	struct pe_raw_image	map;
+	struct pe_image_meta *	meta;
+	struct pe_io_ctx	ioctx;
+	struct pe_common_ctx	cctx;
+	struct pe_unit_ctx	uctx;
+};
+
 #endif
diff --git a/src/internal/perk_impl.h b/src/internal/perk_impl.h
deleted file mode 100644
index 8d8ecc3..0000000
--- a/src/internal/perk_impl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef PERK_IMPL_H
-#define PERK_IMPL_H
-
-#include <stdint.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#include <perk/perk.h>
-#include <perk/perk_meta.h>
-
-struct pe_driver_ctx_impl {
-	struct pe_symbol_ctx	symctx;
-	struct pe_output_ctx	outctx;
-	struct pe_linker_ctx	lnkctx;
-	struct pe_server_ctx	srvctx;
-	struct pe_io_ctx	ioctx;
-	struct pe_common_ctx	cctx;
-	struct pe_driver_ctx	ctx;
-};
-
-struct pe_unit_ctx_impl {
-	const char *		path;
-	struct pe_raw_image	map;
-	struct pe_image_meta *	meta;
-	struct pe_io_ctx	ioctx;
-	struct pe_common_ctx	cctx;
-	struct pe_unit_ctx	uctx;
-};
-
-#endif
-- 
cgit v1.2.3