diff options
author | trhodes <trhodes@FreeBSD.org> | 2004-12-10 15:24:40 +0000 |
---|---|---|
committer | trhodes <trhodes@FreeBSD.org> | 2004-12-10 15:24:40 +0000 |
commit | a659824fbd6d00f76ce4d0f880227ba26abfa7b8 (patch) | |
tree | ecddfa78aa35a2badcb1a43b4e07713a73436f7a /include | |
parent | d78a3892e06435d8bab8c6519f9c7d54ea83654d (diff) | |
download | FreeBSD-src-a659824fbd6d00f76ce4d0f880227ba26abfa7b8.zip FreeBSD-src-a659824fbd6d00f76ce4d0f880227ba26abfa7b8.tar.gz |
According to the information on:
http://www.opengroup.org/onlinepubs/009695399/functions/swab.html
the prototype for swab() should be in <unistd.h> and not in <string.h>.
Move it, and update to match SUS. Leave the prototype in string.h for
now, for backwards compat.
PR: 74751
Submitted by: Craig Rodrigues <rodrigc@crodrigues.org>
Discussed with: das
Diffstat (limited to 'include')
-rw-r--r-- | include/string.h | 15 | ||||
-rw-r--r-- | include/unistd.h | 7 |
2 files changed, 19 insertions, 3 deletions
diff --git a/include/string.h b/include/string.h index 3844d41..efc8aec 100644 --- a/include/string.h +++ b/include/string.h @@ -108,8 +108,19 @@ char *strtok_r(char *, const char *, char **); #endif size_t strxfrm(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE -void swab(const void *, void *, size_t); -#endif + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED + +#ifndef _SSIZE_T_DECLARED +typedef __ssize_t ssize_t; +#define _SSIZE_T_DECLARED +#endif /* _SIZE_T_DECLARED */ + +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + +#endif /* __BSD_VISIBLE */ __END_DECLS #endif /* _STRING_H_ */ diff --git a/include/unistd.h b/include/unistd.h index 56551f8..fa73462 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -436,7 +436,12 @@ ssize_t pwrite(int, const void *, size_t, off_t); int setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */ int setregid(gid_t, gid_t); int setreuid(uid_t, uid_t); -/* void swab(const void * __restrict, void * __restrict, ssize_t); */ + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + void sync(void); useconds_t ualarm(useconds_t, useconds_t); int usleep(useconds_t); |