laforge submitted this change.

View Change


Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved
osmo_io: Dont use __linux__ but !EMBEDDED

osmo_io (unlike its io_uring backend) is not linux specific, so putting
it in an "#ifdef __linux__" block is plain wrong.

A side-effect is that all our doxygen comments are not processed as
__linux__ is not set while doxygen parses the source file.

Change-Id: I260443ba3cd0bb81dade434208dea4ea70fe8ad8
---
M src/core/osmo_io.c
M src/core/osmo_io_poll.c
2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index 57eba6c..745d783 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -21,7 +21,7 @@
*/

#include "../config.h"
-#if defined(__linux__)
+#ifndef EMBEDDED

#include <fcntl.h>
#include <stdio.h>
@@ -934,4 +934,4 @@
}


-#endif /* defined(__linux__) */
+#endif /* ifndef(EMBEDDED) */
diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c
index fae552c..c4bb376 100644
--- a/src/core/osmo_io_poll.c
+++ b/src/core/osmo_io_poll.c
@@ -21,7 +21,7 @@
*/

#include "../config.h"
-#if defined(__linux__)
+#ifndef EMBEDDED

#include <errno.h>
#include <stdio.h>
@@ -198,4 +198,4 @@
.notify_connected = iofd_poll_notify_connected,
};

-#endif /* defined(__linux__) */
+#endif /* ifndef EMBEDDED */

To view, visit change 36287. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I260443ba3cd0bb81dade434208dea4ea70fe8ad8
Gerrit-Change-Number: 36287
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged