Date: Fri, 31 May 2024 16:05:11 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: cab9ccf3ff8c - main - wpa: Diff reduction with upstream Message-ID: <202405311605.44VG5BW0013451@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cab9ccf3ff8c5722dace61a814d791aeba2751c6 commit cab9ccf3ff8c5722dace61a814d791aeba2751c6 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-05-31 16:02:37 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-05-31 16:02:37 +0000 wpa: Diff reduction with upstream I inadvertantly added gratuitous changes to upstream. Revert the gratuitous parts of 676041c41ba5 Suggested by: cy Fixes: 676041c41ba5 Sponsored by: Netflix --- contrib/wpa/src/utils/os_unix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/wpa/src/utils/os_unix.c b/contrib/wpa/src/utils/os_unix.c index a856179fb3b1..c2f9e4fd1306 100644 --- a/contrib/wpa/src/utils/os_unix.c +++ b/contrib/wpa/src/utils/os_unix.c @@ -96,12 +96,12 @@ int os_get_reltime(struct os_reltime *t) return 0; } switch (clock_id) { -#if defined(CLOCK_BOOTTIME) +#ifdef CLOCK_BOOTTIME case CLOCK_BOOTTIME: clock_id = CLOCK_MONOTONIC; break; #endif -#if defined(CLOCK_MONOTONIC) +#ifdef CLOCK_MONOTONIC /* * FreeBSD has both BOOTTIME and MONOTONIC defined to the same value, since they * mean the same thing. FreeBSD 14.1 and ealier don't, so need this case.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405311605.44VG5BW0013451>