diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/head/errno.h | 8 | ||||
| -rw-r--r-- | usr/src/head/iso/stddef_iso.h | 5 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/memset_s.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/set_constraint_handler_s.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/mapfile-vers | 5 | ||||
| -rw-r--r-- | usr/src/test/libc-tests/tests/memset_s.c | 1 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/feature_tests.h | 9 |
7 files changed, 20 insertions, 12 deletions
diff --git a/usr/src/head/errno.h b/usr/src/head/errno.h index 17e6b38942..f52fdeae21 100644 --- a/usr/src/head/errno.h +++ b/usr/src/head/errno.h @@ -60,6 +60,14 @@ extern int errno; #endif #endif /* defined(_REENTRANT) || defined(_TS_ERRNO) */ +#if __EXT1_VISIBLE +/* ISO/IEC 9899:2011 K.3.2.2 */ +#ifndef _ERRNO_T_DEFINED +#define _ERRNO_T_DEFINED +typedef int errno_t; +#endif +#endif /* __EXT1_VISIBLE */ + #ifdef __cplusplus } #endif diff --git a/usr/src/head/iso/stddef_iso.h b/usr/src/head/iso/stddef_iso.h index f42c1041d8..6e0ac631d6 100644 --- a/usr/src/head/iso/stddef_iso.h +++ b/usr/src/head/iso/stddef_iso.h @@ -95,11 +95,6 @@ typedef _MAX_ALIGNMENT_TYPE max_align_t; #define _RSIZE_T_DEFINED typedef size_t rsize_t; #endif -/* ISO/IEC 9899:2011 K.3.2.2 */ -#ifndef _ERRNO_T_DEFINED -#define _ERRNO_T_DEFINED -typedef int errno_t; -#endif #endif /* __EXT1_VISIBLE */ #ifdef __cplusplus diff --git a/usr/src/lib/libc/port/gen/memset_s.c b/usr/src/lib/libc/port/gen/memset_s.c index 9f3fcf8ec0..c77b02de20 100644 --- a/usr/src/lib/libc/port/gen/memset_s.c +++ b/usr/src/lib/libc/port/gen/memset_s.c @@ -27,6 +27,8 @@ * Copyright 2018 Nexenta Systems, Inc. */ +#define __STDC_WANT_LIB_EXT1__ 1 + #include "lint.h" #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/set_constraint_handler_s.c b/usr/src/lib/libc/port/gen/set_constraint_handler_s.c index 3466b8a1d0..2261a8df0a 100644 --- a/usr/src/lib/libc/port/gen/set_constraint_handler_s.c +++ b/usr/src/lib/libc/port/gen/set_constraint_handler_s.c @@ -27,6 +27,8 @@ * Copyright 2018 Nexenta Systems, Inc. */ +#define __STDC_WANT_LIB_EXT1__ 1 + #include "lint.h" #include <sys/types.h> diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers index 812c0c94d5..9992247d90 100644 --- a/usr/src/lib/libc/port/mapfile-vers +++ b/usr/src/lib/libc/port/mapfile-vers @@ -599,6 +599,11 @@ $if lf64 posix_fadvise64; posix_fallocate64; $endif +} SUNW_1.22.7; + +SYMBOL_VERSION SUNW_1.22.7 { # s10u10 - SunOS 5.10 (Solaris 10) patch additions + protected: + SUNW_1.22.7; } SUNW_1.22.6; SYMBOL_VERSION SUNW_1.22.6 { # s10u9 - SunOS 5.10 (Solaris 10) patch additions diff --git a/usr/src/test/libc-tests/tests/memset_s.c b/usr/src/test/libc-tests/tests/memset_s.c index 4a73459bc5..eb44230d60 100644 --- a/usr/src/test/libc-tests/tests/memset_s.c +++ b/usr/src/test/libc-tests/tests/memset_s.c @@ -24,6 +24,7 @@ */ #include <assert.h> +#include <errno.h> #include <stdint.h> #include <stdlib.h> #include <string.h> diff --git a/usr/src/uts/common/sys/feature_tests.h b/usr/src/uts/common/sys/feature_tests.h index 7e4b4fc67f..41c0fb2a4c 100644 --- a/usr/src/uts/common/sys/feature_tests.h +++ b/usr/src/uts/common/sys/feature_tests.h @@ -437,19 +437,14 @@ extern "C" { #endif /* ISO/IEC 9899:2011 Annex K */ -#if !defined(_STRICT_SYMBOLS) -#define __EXT1_VISIBLE 1 -#else -#define __EXT1_VISIBLE 0 -#endif - #if defined(__STDC_WANT_LIB_EXT1__) -#undef __EXT1_VISIBLE #if __STDC_WANT_LIB_EXT1__ #define __EXT1_VISIBLE 1 #else #define __EXT1_VISIBLE 0 #endif +#else +#define __EXT1_VISIBLE 0 #endif /* __STDC_WANT_LIB_EXT1__ */ /* |