diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
| commit | 5f00496ef2e39b976b062f196ff01a99fd4864a4 (patch) | |
| tree | 20be9cbc8f4b7ed3e616ce23552728083801e846 /usr/src/head/string.h | |
| parent | af59b1a40df03681c1c8129aea7b1f5f52f2bcea (diff) | |
| parent | 86bb58aec7165f8a0303564575c65e5a2ad58bf1 (diff) | |
| download | illumos-joyent-release-20140821.tar.gz | |
[illumos-gate merge]20140821release-20140821
commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
5092 env files don't need to define LOCKNAME by default
5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86
Manifests:
usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
usr/src/pkg/manifests/SUNWparted.mf (torch headers)
usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
usr/src/pkg/manifests/system-storage-parted.mf
Diffstat (limited to 'usr/src/head/string.h')
| -rw-r--r-- | usr/src/head/string.h | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/usr/src/head/string.h b/usr/src/head/string.h index ebdb64fb2a..8ef411a60b 100644 --- a/usr/src/head/string.h +++ b/usr/src/head/string.h @@ -66,8 +66,6 @@ using std::strxfrm; extern "C" { #endif -#if defined(__STDC__) - #if defined(__EXTENSIONS__) || \ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || \ defined(_XPG6) || defined(_REENTRANT) @@ -191,64 +189,6 @@ extern __thread size_t __strdupa_len; #endif /* __GNUC__ */ #endif /* __EXTENSIONS__ ... */ -#else /* __STDC__ */ - -#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) || \ - defined(_XPG6) || defined(_REENTRANT) -extern int strerror_r(); -#endif - -#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) || \ - (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_REENTRANT) -extern char *strtok_r(); -#endif - -#if defined(__EXTENSIONS__) || !defined(_STRICT_STDC) || \ - defined(__XOPEN_OR_POSIX) -extern void *memccpy(); -#endif - -#if defined(_XPG7) || !defined(_STRICT_SYMBOLS) -extern int strcasecmp(); -extern int strncasecmp(); -extern int strcasecmp_l(); -extern int strncasecmp_l(); -extern char *stpcpy(); -extern char *stpncpy(); -extern char *strndup(); -extern size_t strnlen(); -extern char *strsignal(); -#endif - -#if !defined(_STRICT_SYMBOLS) -extern int uucopy(); -extern int uucopystr(); -extern int ffs(); -extern int ffsl(); -extern int ffsll(); -extern int fls(); -extern int flsl(); -extern int flsll(); -extern char *strcasestr(); -extern char *strcasestr_l(); -extern char *strnstr(); -extern size_t strlcpy(); -extern size_t strlcat(); -extern char *strsep(); -extern char *strchrnul(); -#endif /* _STRICT_SYMBOLS */ - -#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2) -extern char *strdup(); -#endif - -#if defined(_XPG7) || !defined(_STRICT_SYMBOLS) -extern size_t strcoll_l(); -extern size_t strxfrm_l(); -#endif - -#endif /* __STDC__ */ - #ifdef __cplusplus } #endif |