mirror of
https://github.com/mmueller41/genode.git
synced 2026-01-21 12:32:56 +01:00
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:
@@ -11,6 +11,12 @@
|
|||||||
* under the terms of the GNU General Public License version 2.
|
* 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 */
|
/* libc plugin interface */
|
||||||
#include <libc-plugin/plugin.h>
|
#include <libc-plugin/plugin.h>
|
||||||
#include <libc-plugin/fd_alloc.h>
|
#include <libc-plugin/fd_alloc.h>
|
||||||
@@ -20,13 +26,6 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.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 {
|
namespace {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user