From 2bc8a0f76a5d5ad7266c1b37e596bcbb130f9241 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Tue, 26 Apr 2016 19:09:29 +0200
Subject: [PATCH] Move XML util from os to base repository

Since the dynamic linker depends on the XML utils and we plan to replace
the ancient 'Arg_string' with XML, it is time to move the 'Xml_node' and
'Xml_generator' to base/include.
---
 repos/{os => base}/include/util/print_lines.h   | 6 +++---
 repos/{os => base}/include/util/xml_generator.h | 0
 repos/{os => base}/include/util/xml_node.h      | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename repos/{os => base}/include/util/print_lines.h (95%)
 rename repos/{os => base}/include/util/xml_generator.h (100%)
 rename repos/{os => base}/include/util/xml_node.h (99%)

diff --git a/repos/os/include/util/print_lines.h b/repos/base/include/util/print_lines.h
similarity index 95%
rename from repos/os/include/util/print_lines.h
rename to repos/base/include/util/print_lines.h
index e5dc1b5bae..ec54547c0b 100644
--- a/repos/os/include/util/print_lines.h
+++ b/repos/base/include/util/print_lines.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__OS__PRINT_LINES_H_
-#define _INCLUDE__OS__PRINT_LINES_H_
+#ifndef _INCLUDE__UTIL__PRINT_LINES_H_
+#define _INCLUDE__UTIL__PRINT_LINES_H_
 
 #include <util/string.h>
 
@@ -93,4 +93,4 @@ void Genode::print_lines(char const *string, size_t len, FUNC const &func)
 	}
 }
 
-#endif /* _INCLUDE__OS__PRINT_LINES_H_ */
+#endif /* _INCLUDE__UTIL__PRINT_LINES_H_ */
diff --git a/repos/os/include/util/xml_generator.h b/repos/base/include/util/xml_generator.h
similarity index 100%
rename from repos/os/include/util/xml_generator.h
rename to repos/base/include/util/xml_generator.h
diff --git a/repos/os/include/util/xml_node.h b/repos/base/include/util/xml_node.h
similarity index 99%
rename from repos/os/include/util/xml_node.h
rename to repos/base/include/util/xml_node.h
index 6c0a0feebd..3ad90a3041 100644
--- a/repos/os/include/util/xml_node.h
+++ b/repos/base/include/util/xml_node.h
@@ -18,10 +18,8 @@
 #include <base/exception.h>
 
 namespace Genode {
-
 	class Xml_attribute;
 	class Xml_node;
-
 }