From 99e7f26b99960bf40beb1e42c14b74e18abaccac Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Mon, 16 Mar 2015 15:24:03 +0100
Subject: [PATCH] Remove base/include/base/errno.h, fix #1450

---
 repos/base-foc/src/base/server/server.cc  |  2 +-
 repos/base-nova/src/base/server/server.cc |  2 +-
 repos/base/include/base/errno.h           | 22 ----------------------
 repos/base/include/base/ipc.h             |  3 ++-
 repos/base/include/base/pager.h           |  1 -
 repos/base/src/base/server/server.cc      |  2 +-
 6 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 repos/base/include/base/errno.h

diff --git a/repos/base-foc/src/base/server/server.cc b/repos/base-foc/src/base/server/server.cc
index df44895ad9..abc5cd4510 100644
--- a/repos/base-foc/src/base/server/server.cc
+++ b/repos/base-foc/src/base/server/server.cc
@@ -62,7 +62,7 @@ void Rpc_entrypoint::entry()
 		srv >> IPC_REPLY_WAIT >> opcode;
 
 		/* set default return value */
-		srv.ret(ERR_INVALID_OBJECT);
+		srv.ret(Ipc_client::ERR_INVALID_OBJECT);
 
 		/* check whether capability's label fits global id */
 		if (((unsigned long)srv.badge()) != _rcv_buf.label()) {
diff --git a/repos/base-nova/src/base/server/server.cc b/repos/base-nova/src/base/server/server.cc
index dc6b0254aa..b2045663ee 100644
--- a/repos/base-nova/src/base/server/server.cc
+++ b/repos/base-nova/src/base/server/server.cc
@@ -131,7 +131,7 @@ void Rpc_entrypoint::_activation_entry()
 	srv >> IPC_WAIT >> opcode;
 
 	/* set default return value */
-	srv.ret(ERR_INVALID_OBJECT);
+	srv.ret(Ipc_client::ERR_INVALID_OBJECT);
 
 	/* atomically lookup and lock referenced object */
 	ep->_curr_obj = ep->lookup_and_lock(id_pt);
diff --git a/repos/base/include/base/errno.h b/repos/base/include/base/errno.h
deleted file mode 100644
index 75d22e22db..0000000000
--- a/repos/base/include/base/errno.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * \brief  Genode error codes
- * \author Norman Feske
- * \date   2006-04-28
- */
-
-/*
- * Copyright (C) 2006-2013 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU General Public License version 2.
- */
-
-#ifndef _INCLUDE__BASE__ERRNO_H_
-#define _INCLUDE__BASE__ERRNO_H_
-
-namespace Genode {
-
-	enum { ERR_INVALID_OBJECT = -70000, };
-}
-
-#endif /* _INCLUDE__BASE__ERRNO_H_ */
diff --git a/repos/base/include/base/ipc.h b/repos/base/include/base/ipc.h
index f7a5379c41..bb4b3c0399 100644
--- a/repos/base/include/base/ipc.h
+++ b/repos/base/include/base/ipc.h
@@ -23,7 +23,6 @@
 
 #include <util/misc_math.h>
 #include <util/string.h>
-#include <base/errno.h>
 #include <base/exception.h>
 #include <base/capability.h>
 #include <base/ipc_msgbuf.h>
@@ -439,6 +438,8 @@ class Genode::Ipc_client: public Ipc_istream, public Ipc_ostream
 
 	public:
 
+		enum { ERR_INVALID_OBJECT = -70000, };
+
 		/**
 		 * Constructor
 		 */
diff --git a/repos/base/include/base/pager.h b/repos/base/include/base/pager.h
index 2bba834b73..09be0bf0f6 100644
--- a/repos/base/include/base/pager.h
+++ b/repos/base/include/base/pager.h
@@ -17,7 +17,6 @@
 
 #include <base/thread.h>
 #include <base/thread_state.h>
-#include <base/errno.h>
 #include <base/ipc_pager.h>
 #include <base/printf.h>
 #include <base/object_pool.h>
diff --git a/repos/base/src/base/server/server.cc b/repos/base/src/base/server/server.cc
index d5ecda141f..503300df49 100644
--- a/repos/base/src/base/server/server.cc
+++ b/repos/base/src/base/server/server.cc
@@ -63,7 +63,7 @@ void Rpc_entrypoint::entry()
 		srv >> IPC_REPLY_WAIT >> opcode;
 
 		/* set default return value */
-		srv.ret(ERR_INVALID_OBJECT);
+		srv.ret(Ipc_client::ERR_INVALID_OBJECT);
 
 		/* atomically lookup and lock referenced object */
 		Object_pool<Rpc_object_base>::Guard curr_obj(lookup_and_lock(srv.badge()));