mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 08:40:06 +02:00
5526dd6fe3
* update fish recipe to 3.5.1 * switch to release * reorder BUILD_PREREQUIRES and use cmakeDirArgs
60 lines
1.4 KiB
Plaintext
60 lines
1.4 KiB
Plaintext
From 21ae0a493f309006033103a44f31be43cc78ef08 Mon Sep 17 00:00:00 2001
|
|
From: Ivan Holmes <ivan@ivanholmes.co.uk>
|
|
Date: Wed, 17 Aug 2022 19:30:18 +0100
|
|
Subject: Don't include mount.h on Haiku
|
|
|
|
|
|
diff --git a/src/path.cpp b/src/path.cpp
|
|
index d5a649e..b920d7a 100644
|
|
--- a/src/path.cpp
|
|
+++ b/src/path.cpp
|
|
@@ -6,7 +6,9 @@
|
|
#include "path.h"
|
|
|
|
#include <errno.h>
|
|
+#ifndef __HAIKU__
|
|
#include <sys/mount.h>
|
|
+#endif
|
|
#include <sys/param.h>
|
|
#include <sys/stat.h>
|
|
#if defined(__linux__)
|
|
diff --git a/src/wutil.cpp b/src/wutil.cpp
|
|
index 21ec26d..1848948 100644
|
|
--- a/src/wutil.cpp
|
|
+++ b/src/wutil.cpp
|
|
@@ -11,7 +11,9 @@
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
+#ifndef __HAIKU__
|
|
#include <sys/mount.h>
|
|
+#endif
|
|
#include <sys/stat.h>
|
|
#include <sys/statvfs.h>
|
|
#include <sys/types.h>
|
|
--
|
|
2.36.1
|
|
|
|
|
|
From 74736c3a8584cc05327804cbb13e666dc94efe7b Mon Sep 17 00:00:00 2001
|
|
From: Ivan Holmes <ivan@ivanholmes.co.uk>
|
|
Date: Wed, 17 Aug 2022 19:30:41 +0100
|
|
Subject: remove assertion that exit codes are less than 256
|
|
|
|
|
|
diff --git a/src/proc.h b/src/proc.h
|
|
index 6ac42c7..7d9b719 100644
|
|
--- a/src/proc.h
|
|
+++ b/src/proc.h
|
|
@@ -90,7 +90,6 @@ class proc_status_t {
|
|
constexpr int zerocode = w_exitcode(0, 0);
|
|
static_assert(WIFEXITED(zerocode), "Synthetic exit status not reported as exited");
|
|
|
|
- assert(ret < 256);
|
|
return proc_status_t(w_exitcode(ret, 0 /* sig */));
|
|
}
|
|
|
|
--
|
|
2.36.1
|
|
|