From: Nima Vasseghi <nmv@fb.com>
Date: Tue, 29 Dec 2020 02:01:49 +0000 (-0800)
Subject: macOS: Use correct endian.h & use argp-standalone
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1^2~3^2^2~2^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f7db2ac0a95028a7f82ecb89862426bf53a69232;p=zchunk.git

macOS: Use correct endian.h & use argp-standalone
---

diff --git a/meson.build b/meson.build
index 0b8a405..8abfdf8 100644
--- a/meson.build
+++ b/meson.build
@@ -28,7 +28,7 @@ endif
 
 curl_dep = dependency('libcurl')
 
-if build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); }; void main() {}')
+if build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); }; void main() {}')
     argplib = cc.find_library('argp')
 else
     argplib = dependency('', required : false)
diff --git a/src/lib/index/index_read.c b/src/lib/index/index_read.c
index c6ee98b..875b569 100644
--- a/src/lib/index/index_read.c
+++ b/src/lib/index/index_read.c
@@ -30,6 +30,8 @@
 #include <string.h>
 #ifdef FREEBSD
 #include <sys/endian.h>
+#elif __APPLE__
+#include <machine/endian.h>
 #else
 #include <endian.h>
 #endif