PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Feature test macros overhaul: string.h and strings.h overlaps 

strings.h is the header mandated for these functions in POSIX.1 prior to
2008 (when most of these were removed).  The declarations in string.h are
only for BSD compatibility.  But when both headers are included, avoid
duplicate declarations.

Also, mark stpcpy and stpncpy as POSIX.1-2008.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
This commit is contained in:
Yaakov Selkowitz 2016-04-13 23:50:11 -05:00
parent 7b39124400
commit 9f90ae0435
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
newlib/libc/include/string.h
View File

@ -46,7 +46,7 @@ size_t _EXFUN(strxfrm,(char *__restrict, const char *__restrict, size_t));
#if __MISC_VISIBLE || __POSIX_VISIBLE
char *_EXFUN(strtok_r,(char *__restrict, const char *__restrict, char **__restrict));
#endif
#if __BSD_VISIBLE || (__POSIX_VISIBLE && __POSIX_VISIBLE < 200809)
#if __BSD_VISIBLE /* POSIX declaration is in <strings.h> */
int _EXFUN(bcmp,(const void *, const void *, size_t));
void _EXFUN(bcopy,(const void *, void *, size_t));
void _EXFUN(bzero,(void *, size_t));
@ -56,10 +56,8 @@ void _EXFUN(explicit_bzero,(void *, size_t));
int _EXFUN(timingsafe_bcmp,(const void *, const void *, size_t));
int _EXFUN(timingsafe_memcmp,(const void *, const void *, size_t));
#endif
#if __MISC_VISIBLE || __POSIX_VISIBLE >= 200809
#if __BSD_VISIBLE /* POSIX declaration is in <strings.h> */
int _EXFUN(ffs,(int));
#endif
#if __BSD_VISIBLE || (__POSIX_VISIBLE && __POSIX_VISIBLE < 200809)
char *_EXFUN(index,(const char *, int));
#endif
#if __MISC_VISIBLE || __POSIX_VISIBLE
@ -71,12 +69,14 @@ _PTR _EXFUN(memmem, (const _PTR, size_t, const _PTR, size_t));
_PTR _EXFUN(memrchr,(const _PTR, int, size_t));
_PTR _EXFUN(rawmemchr,(const _PTR, int));
#endif
#if __BSD_VISIBLE || (__POSIX_VISIBLE && __POSIX_VISIBLE < 200809)
#if __BSD_VISIBLE /* POSIX declaration is in <strings.h> */
char *_EXFUN(rindex,(const char *, int));
#endif
#if __POSIX_VISIBLE >= 200809
char *_EXFUN(stpcpy,(char *__restrict, const char *__restrict));
char *_EXFUN(stpncpy,(char *__restrict, const char *__restrict, size_t));
#if __BSD_VISIBLE || __POSIX_VISIBLE
#endif
#if __BSD_VISIBLE /* POSIX declaration is in <strings.h> */
int _EXFUN(strcasecmp,(const char *, const char *));
#endif
#if __GNU_VISIBLE
@ -123,7 +123,7 @@ char * _EXFUN(_strerror_r, (struct _reent *, int, int, int *));
size_t _EXFUN(strlcat,(char *, const char *, size_t));
size_t _EXFUN(strlcpy,(char *, const char *, size_t));
#endif
#if __BSD_VISIBLE || __POSIX_VISIBLE
#if __BSD_VISIBLE /* POSIX declaration is in <strings.h> */
int _EXFUN(strncasecmp,(const char *, const char *, size_t));
#endif
#if __POSIX_VISIBLE >= 200809

5
newlib/libc/include/strings.h
View File

@ -7,6 +7,9 @@
#ifndef _STRINGS_H_
#define _STRINGS_H_
/* These functions are already declared in <string.h> with __BSD_VISIBLE */
#if !(defined(_STRING_H_) && __BSD_VISIBLE)
#include "_ansi.h"
#include <sys/reent.h>
#include <sys/cdefs.h>
@ -32,4 +35,6 @@ int _EXFUN(strncasecmp,(const char *, const char *, size_t));
_END_STD_C
#endif /* !(_STRING_H_ && __BSD_VISIBLE) */
#endif /* _STRINGS_H_ */