diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2024-06-02 05:26:54 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2024-06-02 05:32:25 +0000 |
| commit | d346a6842a1f407cfdb0bb0d1511b7608b468645 (patch) | |
| tree | 9fa72f4d32f624d8946446aea7b7241f03c65422 | |
| parent | 66318d0a56a837820885398a68c9a86a4dc13cd5 (diff) | |
| download | ports-d346a6842a1f407cfdb0bb0d1511b7608b468645.tar.gz ports-d346a6842a1f407cfdb0bb0d1511b7608b468645.zip | |
net/hostapd29: Fix 15-CURRENT 108de784513d build
On FreeBSD systems without 108de784513d the old definition will be used
while on 108de784513d and newer the duplicate case will be removed.
Obtained from: src 676041c41ba5
Discussed with: imp
| -rw-r--r-- | net/hostapd29/files/patch-src_utils_os__unix.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/net/hostapd29/files/patch-src_utils_os__unix.c b/net/hostapd29/files/patch-src_utils_os__unix.c index c56eee136a44..da8dbe006d12 100644 --- a/net/hostapd29/files/patch-src_utils_os__unix.c +++ b/net/hostapd29/files/patch-src_utils_os__unix.c @@ -1,18 +1,15 @@ ---- src/utils/os_unix.c.orig 2015-09-27 19:02:05 UTC -+++ src/utils/os_unix.c -@@ -442,6 +442,7 @@ int os_file_exists(const char *fname) - } - - -+#if !defined __FreeBSD__ && !defined __DragonFly__ - int os_fdatasync(FILE *stream) - { - if (!fflush(stream)) { -@@ -459,6 +460,7 @@ int os_fdatasync(FILE *stream) - - return -1; - } +--- src/utils/os_unix.c.orig 2024-06-01 22:24:31.970700000 -0700 ++++ src/utils/os_unix.c 2024-06-01 22:25:35.160514000 -0700 +@@ -97,10 +97,12 @@ + break; + #endif + #ifdef CLOCK_MONOTONIC ++#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC) + case CLOCK_MONOTONIC: + clock_id = CLOCK_REALTIME; + break; + #endif +#endif - - - #ifndef WPA_TRACE + case CLOCK_REALTIME: + return -1; + } |