From 54c91f145874ec5352c876b356524b75bf3ea0c5 Mon Sep 17 00:00:00 2001
From: Brendan Chandler <bchandler@anl.gov>
Date: Tue, 2 Feb 2021 16:44:01 -0600
Subject: [PATCH] Fix compile errors after rebasing changes for RTEMS5

---
 configure/os/CONFIG.Common.RTEMS         | 3 +--
 modules/libcom/RTEMS/kernel/rtems_init.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS
index c9f22b343..fb3b3521a 100644
--- a/configure/os/CONFIG.Common.RTEMS
+++ b/configure/os/CONFIG.Common.RTEMS
@@ -97,8 +97,7 @@ OS_CLASS = RTEMS
 
 #--------------------------------------------------
 # Operating system compile & link flags
-OP_SYS_CFLAGS_API_posix = -D__LINUX_ERRNO_EXTENSIONS__
-OP_SYS_CFLAGS += $(OP_SYS_CFLAGS_API_$(OS_API))
+OP_SYS_CFLAGS += -D__LINUX_ERRNO_EXTENSIONS__
 
 OP_SYS_CFLAGS_NET_yes = -DRTEMS_LEGACY_STACK
 OP_SYS_CFLAGS_NET_no  = -DHAVE_SOCKADDR_SA_LEN=1
diff --git a/modules/libcom/RTEMS/kernel/rtems_init.c b/modules/libcom/RTEMS/kernel/rtems_init.c
index 986e09623..99a67226d 100644
--- a/modules/libcom/RTEMS/kernel/rtems_init.c
+++ b/modules/libcom/RTEMS/kernel/rtems_init.c
@@ -42,7 +42,7 @@
 #include "logClient.h"
 #include "osiUnistd.h"
 #include "iocsh.h"
-#include "osdTime.h"
+#include "../../src/osi/os/RTEMS-kernel/osdTime.h"
 #include "epicsMemFs.h"
 
 #include "epicsRtemsInitHooks.h"