From dffc1b0497ef09452f3a7abaa565bba7ec5f0a2f Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Wed, 23 Nov 2016 14:09:56 +0100
Subject: [PATCH] os: move ram_session_guard from nic_bridge to os

Issue #1039
---
 .../server/nic_bridge => include/os}/ram_session_guard.h    | 6 +++---
 repos/os/src/server/nic_bridge/component.h                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename repos/os/{src/server/nic_bridge => include/os}/ram_session_guard.h (90%)

diff --git a/repos/os/src/server/nic_bridge/ram_session_guard.h b/repos/os/include/os/ram_session_guard.h
similarity index 90%
rename from repos/os/src/server/nic_bridge/ram_session_guard.h
rename to repos/os/include/os/ram_session_guard.h
index 7f1d6d8d10..97103df353 100644
--- a/repos/os/src/server/nic_bridge/ram_session_guard.h
+++ b/repos/os/include/os/ram_session_guard.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _RAM_SESSION_GUARD_H_
-#define _RAM_SESSION_GUARD_H_
+#ifndef _INCLUDE__OS__RAM_SESSION_GUARD_H_
+#define _INCLUDE__OS__RAM_SESSION_GUARD_H_
 
 #include <dataspace/client.h>
 #include <ram_session/ram_session.h>
@@ -60,4 +60,4 @@ class Genode::Ram_session_guard : public Genode::Ram_session
 		size_t used() override { return _used; }
 };
 
-#endif /* _RAM_SESSION_GUARD_H_ */
+#endif /* _INCLUDE__OS__RAM_SESSION_GUARD_H_ */
diff --git a/repos/os/src/server/nic_bridge/component.h b/repos/os/src/server/nic_bridge/component.h
index 4474528008..797b2c9793 100644
--- a/repos/os/src/server/nic_bridge/component.h
+++ b/repos/os/src/server/nic_bridge/component.h
@@ -20,6 +20,7 @@
 #include <nic/packet_allocator.h>
 #include <nic_session/rpc_object.h>
 #include <nic_session/connection.h>
+#include <os/ram_session_guard.h>
 #include <os/session_policy.h>
 #include <root/component.h>
 #include <util/arg_string.h>
@@ -28,7 +29,6 @@
 #include <mac.h>
 #include <nic.h>
 #include <packet_handler.h>
-#include <ram_session_guard.h>
 
 namespace Net {
 	class Stream_allocator;