# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1630104884 -7200
# Node ID a956628cf8e97f56719b039be8f0da0212dfcce2
# Parent  78a45e9e4a55144016c5358a4d14a66d4c8c3bfb
Removed non-functioning workarounds, establishing a version-specific branch.

diff -r 78a45e9e4a55 -r a956628cf8e9 libipc/lib/src/mem_ipc.c
--- a/libipc/lib/src/mem_ipc.c	Sat Aug 28 00:28:46 2021 +0200
+++ b/libipc/lib/src/mem_ipc.c	Sat Aug 28 00:54:44 2021 +0200
@@ -71,12 +71,6 @@
   return l4re_ma_alloc_align(size, cap, flags, align);
 }
 
-/* Work around API change. */
-
-#ifndef L4RE_RM_SEARCH_ADDR
-#define L4RE_RM_SEARCH_ADDR L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RW
-#endif
-
 /* Attach a dataspace region. Similar to l4re_rm_attach. */
 
 long ipc_attach_dataspace(l4re_ds_t ds, unsigned long size, void **addr)
diff -r 78a45e9e4a55 -r a956628cf8e9 libmem/include/mem/flexpage.h
--- a/libmem/include/mem/flexpage.h	Sat Aug 28 00:28:46 2021 +0200
+++ b/libmem/include/mem/flexpage.h	Sat Aug 28 00:54:44 2021 +0200
@@ -27,18 +27,6 @@
 
 
 
-/* Work around API change. */
-
-#ifndef L4RE_DS_MAP_FLAG_RO
-#define L4RE_DS_MAP_FLAG_RO L4RE_DS_F_R
-#endif
-
-#ifndef L4RE_DS_MAP_FLAG_RW
-#define L4RE_DS_MAP_FLAG_RW L4RE_DS_F_RW
-#endif
-
-
-
 /* A flexpage abstraction. */
 
 class Flexpage