diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-18 13:03:13 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-18 13:03:13 +0000 |
| commit | 25b01135ad8be1fdedfb11fb76ed33f61b342df1 (patch) | |
| tree | 66b5155562ac8306d53e7b77356f75327b66d125 /usr/src/head/iso/string_iso.h | |
| parent | 67fad88d8d5136137ff0cacefc56a2f296803cc0 (diff) | |
| parent | 2dc5cbd37af38054ac6aab88a3ecee22a13ed2eb (diff) | |
| download | illumos-joyent-25b01135ad8be1fdedfb11fb76ed33f61b342df1.tar.gz | |
[illumos-gate merge]
commit 2dc5cbd37af38054ac6aab88a3ecee22a13ed2eb
9312 ctf: be less clever about skipping 'extern' variables declarations
9864 DWARF->CTF enum conversion needs to be careful of sign
commit 50971960b7b1866cdd785b20a4df98c90c231638
10224 memset_s() is not visible in global C++ namespace
commit 7c9ce9e029489432cc8d45437d8ecd0b9750d68d
10194 iscsi: this statement may fall through
commit 71222654120258353fa867d14ad838c458c823d7
10193 ddi_intr: cast between incompatible function types
commit 1b9bce10d88d75c318f27b82ba816b744c6f1075
10190 aphysio: cast between incompatible function types
commit b94c9724091d6587cd76f6ec562dc8888e3f31c0
10189 fdbuffer: cast between incompatible function types
commit f3618278e9f3d420057d55d344e871e4d0c45517
10188 libast: cast between incompatible function types
commit f91fcf59ac2fd04f1816f3dcbc69a46d44276a65
10165 libzpool: passing argument 1 to restrict-qualified parameter aliases with argument 4
commit 04443fde3a2688e592571a7bcca114860cf07bb3
10025 qede: rename OFFSETOF to offsetof and remove local definitions
commit 24c5c9f44237084e2bc735b78e3c0009959de21b
10088 ldterm_do_ioctl() shouldn't check for a NULL array
commit 80e3e2368f7911a78a5f2f1a961052b37f3a76d0
10087 atge_attach() doesn't need to check for kmem_zalloc() success
commit bb54aa2057d4245bc905df8c193acb7b8b0bb74b
10086 ixgbe_m_propinfo() is missing an 'else'
commit c1bf5ca093201aa1b43846f6bc194c780f03599e
10085 sctp_getpeeraddrs() doesn't need to check for a NULL primary
commit f19903c648bc62d61c7a20de6269dc85395c965b
10084 fop_open() doesn't need to check for a NULL vnode
commit d6294894f9d15dfb12a0dd3a6acf8bd4a4a65408
10083 smatch fixes for common/fs/vfs.c
commit 598f111b6a2800d5bd143949a1bdb1e786a92fc3
10082 intel_nhm is checking for NULL arrays
commit 45ca53447fde2f014d6d62f6bbbfc0b97ae011dd
10215 lofiadm -la fails after lofiadm -a / lofiadm -d
Diffstat (limited to 'usr/src/head/iso/string_iso.h')
| -rw-r--r-- | usr/src/head/iso/string_iso.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/usr/src/head/iso/string_iso.h b/usr/src/head/iso/string_iso.h index d493e13008..6c068101f1 100644 --- a/usr/src/head/iso/string_iso.h +++ b/usr/src/head/iso/string_iso.h @@ -143,12 +143,26 @@ extern char *strrchr(const char *, int); extern char *strstr(const char *, const char *); #endif /* __cplusplus >= 199711L */ +#if __cplusplus >= 199711L +} +#endif /* end of namespace std */ + +/* + * ISO C11 Annex K functions are not allowed to be in the standard + * namespace; however, it is implementation-defined as to whether or + * not they are in the global namespace and we opt to make them + * available to software. + */ #if __EXT1_VISIBLE #ifndef _RSIZE_T_DEFINED #define _RSIZE_T_DEFINED +#if __cplusplus >= 199711L +typedef std::size_t rsize_t; +#else typedef size_t rsize_t; #endif +#endif #ifndef _ERRNO_T_DEFINED #define _ERRNO_T_DEFINED @@ -159,10 +173,6 @@ typedef int errno_t; extern errno_t memset_s(void *, rsize_t, int, rsize_t); #endif /* __EXT1_VISIBLE */ -#if __cplusplus >= 199711L -} -#endif /* end of namespace std */ - #ifdef __cplusplus } #endif |