dde_linux: adapt to changes in os/duration.h

The Linux emulation library provides preprocessor macros for min() and
max(), which now clash with implementation in duration.h. So, we disable
those macros in the delay implementation.
This commit is contained in:
Christian Helmuth 2018-11-30 15:05:09 +01:00 committed by Norman Feske
parent eead1af140
commit 6315e4503e
3 changed files with 13 additions and 2 deletions

View File

@ -20,7 +20,6 @@
/* emulation */
#include <platform.h>
#include <lx_emul.h>
#include <timer_session/connection.h>
/* dwc-otg */
#define new new_

View File

@ -11,6 +11,15 @@
* version 2.
*/
/*
* Disable preprocessor macros that are incompatible to Genode headers for this
* file.
*/
#pragma push_macro("max")
#pragma push_macro("min")
#undef max
#undef min
/* Genode includes */
#include <timer_session/connection.h>
@ -49,3 +58,7 @@ void msleep(unsigned int msecs)
void mdelay(unsigned long msecs) { msleep(msecs); }
#pragma pop_macro("max")
#pragma pop_macro("min")

View File

@ -20,7 +20,6 @@
/* emulation */
#include <platform.h>
#include <lx_emul.h>
#include <timer_session/connection.h>
/* dwc-otg */
#define new new_