X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Ftime.h;h=72a9afff47ef0a4db433bc3f78d995b98ef0d3fd;hb=40fd2ccf9faa3e8b6d67d40c8ee52a2b3d1f07bd;hp=17447b3724bee5ef4c0bf0a30a080317f40d7748;hpb=707de922fab70af1b4238c33359b77d1ebd1ee34;p=lttng-tools.git diff --git a/src/common/compat/time.h b/src/common/compat/time.h index 17447b372..72a9afff4 100644 --- a/src/common/compat/time.h +++ b/src/common/compat/time.h @@ -1,23 +1,8 @@ /* * Copyright (C) 2016 Michael Jeanson * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #ifndef _COMPAT_TIME_H @@ -31,10 +16,12 @@ typedef uint64_t timer_t; #include #include +#include #undef NSEC_PER_SEC #undef NSEC_PER_MSEC #undef NSEC_PER_USEC +#undef USEC_PER_SEC #endif /* __APPLE__ */ @@ -66,8 +53,8 @@ int lttng_clock_gettime(clockid_t clk_id, struct timespec *tp) goto deallocate; } - tp->tv_sec = now.tv_sec; - tp->tv_nsec = now.tv_nsec; + tp->tv_sec = now.tv_sec; + tp->tv_nsec = now.tv_nsec; deallocate: mach_port_deallocate(mach_task_self(), clock);