Print this page
code review feeback, close open comment
first round of POSIX 2008 stuff
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/uts/common/sys/timeb.h
+++ new/usr/src/uts/common/sys/timeb.h
1 1 /*
2 2 * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
3 3 * Use is subject to license terms.
4 4 */
5 5
6 +/*
7 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
8 + */
9 +
6 10 #ifndef _SYS_TIMEB_H
7 11 #define _SYS_TIMEB_H
8 12
9 -#pragma ident "%Z%%M% %I% %E% SMI"
10 -
11 13 #ifdef __cplusplus
12 14 extern "C" {
13 15 #endif
14 16
15 17 #include <sys/types.h>
18 +#include <sys/feature_tests.h>
16 19
17 20 /*
18 21 * Copyright (c) 1991, 1993
19 22 * The Regents of the University of California. All rights reserved.
20 23 * (c) UNIX System Laboratories, Inc.
21 24 * All or some portions of this file are derived from material licensed
22 25 * to the University of California by American Telephone and Telegraph
23 26 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
24 27 * the permission of UNIX System Laboratories, Inc.
25 28 *
26 29 * Redistribution and use in source and binary forms, with or without
27 30 * modification, are permitted provided that the following conditions
28 31 * are met:
29 32 * 1. Redistributions of source code must retain the above copyright
30 33 * notice, this list of conditions and the following disclaimer.
31 34 * 2. Redistributions in binary form must reproduce the above copyright
32 35 * notice, this list of conditions and the following disclaimer in the
33 36 * documentation and/or other materials provided with the distribution.
34 37 * 3. All advertising materials mentioning features or use of this software
35 38 * must display the following acknowledgement:
36 39 * This product includes software developed by the University of
37 40 * California, Berkeley and its contributors.
38 41 * 4. Neither the name of the University nor the names of its contributors
39 42 * may be used to endorse or promote products derived from this software
40 43 * without specific prior written permission.
41 44 *
42 45 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
43 46 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
44 47 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
↓ open down ↓ |
19 lines elided |
↑ open up ↑ |
45 48 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
46 49 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
47 50 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
48 51 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
49 52 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
50 53 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
51 54 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
52 55 * SUCH DAMAGE.
53 56 */
54 57
55 -/* The ftime(2) system call structure */
58 +
59 +/*
60 + * NOTE: This lives in sys/timeb.h due to standards requirements.
61 + * The actual function is not a system call, but a libc function. Hence
62 + * this header should never be included into kernel modules. Presumably
63 + * the header shouldn't be included unless ftime() is desired, since it
64 + * defines nothing else, but be pedantic.
65 + */
66 +
67 +#ifndef _KERNEL
68 +
69 +#if (!defined(_STRICT_SYMBOLS)) || (defined(_XPG4_2) && !defined(_XPG7))
56 70 struct timeb {
57 71 time_t time; /* seconds since the Epoch */
58 72 unsigned short millitm; /* + milliseconds since the Epoch */
59 73 short timezone; /* minutes west of CUT */
60 74 short dstflag; /* DST == non-zero */
61 75 };
62 76
63 -#if defined(__STDC__)
64 77 extern int ftime(struct timeb *);
65 -#else
66 -extern int ftime();
67 78 #endif
68 79
80 +#endif /* _KERNEL */
81 +
69 82 #ifdef __cplusplus
70 83 }
71 84 #endif
72 85
73 86 #endif /* _SYS_TIMEB_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX