mirror of
https://github.com/genodelabs/genode.git
synced 2025-02-20 17:52:52 +00:00
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:
parent
eead1af140
commit
6315e4503e
@ -20,7 +20,6 @@
|
||||
/* emulation */
|
||||
#include <platform.h>
|
||||
#include <lx_emul.h>
|
||||
#include <timer_session/connection.h>
|
||||
|
||||
/* dwc-otg */
|
||||
#define new new_
|
||||
|
@ -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")
|
||||
|
@ -20,7 +20,6 @@
|
||||
/* emulation */
|
||||
#include <platform.h>
|
||||
#include <lx_emul.h>
|
||||
#include <timer_session/connection.h>
|
||||
|
||||
/* dwc-otg */
|
||||
#define new new_
|
||||
|
Loading…
x
Reference in New Issue
Block a user