From cca4b7b43cd2ed210dea7e672e35baf4e82b0ceb Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Fri, 16 Mar 2012 14:45:54 +0100
Subject: [PATCH] Change include order to remedy conflicting defines

Both the libc and the NOVA syscall bindings provide the definition of
PAGE_SIZE. In contrast to the libc, which uses a #define, the NOVA
syscalls uses a proper enum value. Thus, we can work around the conflict
by including the NOVA syscalls header prior the libc header. Fixes #152.
---
 libports/src/lib/libc_rom/plugin.cc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libports/src/lib/libc_rom/plugin.cc b/libports/src/lib/libc_rom/plugin.cc
index bd7d01560c..6be47eeb23 100644
--- a/libports/src/lib/libc_rom/plugin.cc
+++ b/libports/src/lib/libc_rom/plugin.cc
@@ -11,6 +11,12 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+/* Genode includes */
+#include <os/attached_rom_dataspace.h>
+#include <util/misc_math.h>
+#include <base/printf.h>
+#include <base/env.h>
+
 /* libc plugin interface */
 #include <libc-plugin/plugin.h>
 #include <libc-plugin/fd_alloc.h>
@@ -20,13 +26,6 @@
 #include <errno.h>
 #include <string.h>
 
-/* Genode includes */
-#include <os/attached_rom_dataspace.h>
-#include <util/misc_math.h>
-#include <base/printf.h>
-#include <base/env.h>
-
-
 namespace {
 
 	/**