treewide: consolidate platform specific code in platform.c

Get rid of most __APPLE__ guards by introducing a central platform.c unit
providing drop-in replacements for missing APIs.

Also move system signal definitions into the new platform file to be able
to share them with the upcoming debug library.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

4 files changed, 4 insertions, 11 deletions

diff --git a/lib/fs.c b/lib/fs.c
index e00f7fa..0f03ad4 100644
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -60,11 +60,8 @@
 #include <limits.h>
 #include <fcntl.h>
 
-#ifndef __APPLE__
-#include <sys/sysmacros.h> /* major(), minor() */
-#endif
-
 #include "ucode/module.h"
+#include "ucode/platform.h"
 
 #define err_return(err) do { last_error = err; return NULL; } while(0)
 
diff --git a/lib/nl80211.c b/lib/nl80211.c
index c7bd5fa..49aea32 100644
--- a/lib/nl80211.c
+++ b/lib/nl80211.c
@@ -24,7 +24,6 @@ limitations under the License.
 #include <limits.h>
 #include <math.h>
 #include <assert.h>
-#include <endian.h>
 #include <fcntl.h>
 #include <poll.h>
 
@@ -43,6 +42,7 @@ limitations under the License.
 #include <libubox/uloop.h>
 
 #include "ucode/module.h"
+#include "ucode/platform.h"
 
 #define DIV_ROUND_UP(n, d)      (((n) + (d) - 1) / (d))
 
diff --git a/lib/rtnl.c b/lib/rtnl.c
index b5afde4..e5efa25 100644
--- a/lib/rtnl.c
+++ b/lib/rtnl.c
@@ -24,7 +24,6 @@ limitations under the License.
 #include <limits.h>
 #include <math.h>
 #include <assert.h>
-#include <endian.h>
 
 #include <netinet/ether.h>
 #include <arpa/inet.h>
@@ -52,6 +51,7 @@ limitations under the License.
 #include <libubox/uloop.h>
 
 #include "ucode/module.h"
+#include "ucode/platform.h"
 
 #define DIV_ROUND_UP(n, d)      (((n) + (d) - 1) / (d))
 
diff --git a/lib/uloop.c b/lib/uloop.c
index 99cd984..d8d702f 100644
--- a/lib/uloop.c
+++ b/lib/uloop.c
@@ -23,6 +23,7 @@
 #include <libubox/uloop.h>
 
 #include "ucode/module.h"
+#include "ucode/platform.h"
 
 #define err_return(err) do { last_error = err; return NULL; } while(0)
 
@@ -535,13 +536,8 @@ uc_uloop_process(uc_vm_t *vm, size_t nargs)
 			free(buf);
 		}
 
-#ifdef __APPLE__
-		execve((const char *)ucv_string_get(executable),
-		       (char * const *)argp, (char * const *)envp);
-#else
 		execvpe((const char *)ucv_string_get(executable),
 		        (char * const *)argp, (char * const *)envp);
-#endif
 
 		_exit(-1);
 	}