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.
This commit is contained in:
Norman Feske 2012-03-16 14:45:54 +01:00
parent bbce38cb36
commit cca4b7b43c
1 changed files with 6 additions and 7 deletions

View File

@ -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 {
/**