Merge Lite2 changes -

move getopt etc declarations from stdlib.h to unistd.h
This commit is contained in:
Peter Wemm 1997-03-11 11:18:25 +00:00
parent 161f948dd3
commit c59376af7a
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=23657
2 changed files with 12 additions and 11 deletions

View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)stdlib.h 8.3 (Berkeley) 2/16/94
* @(#)stdlib.h 8.5 (Berkeley) 5/19/95
*/
#ifndef _STDLIB_H_
@ -146,17 +146,10 @@ int daemon __P((int, int));
char *devname __P((int, int));
int getloadavg __P((double [], int));
extern char *optarg; /* getopt(3) external variables */
extern int opterr, optind, optopt;
int getopt __P((int, char * const *, const char *));
extern char *suboptarg; /* getsubopt(3) external variable */
int getsubopt __P((char **, char * const *, char **));
char *group_from_gid __P((unsigned long, int));
int heapsort __P((void *, size_t, size_t,
int (*)(const void *, const void *)));
char *initstate __P((unsigned, char *, int));
char *initstate __P((unsigned long, char *, long));
int mergesort __P((void *, size_t, size_t,
int (*)(const void *, const void *)));
int radixsort __P((const unsigned char **, int, const unsigned char *,
@ -166,7 +159,7 @@ int sradixsort __P((const unsigned char **, int, const unsigned char *,
long random __P((void));
char *realpath __P((const char *, char resolved_path[]));
char *setstate __P((char *));
void srandom __P((unsigned));
void srandom __P((unsigned long));
char *user_from_uid __P((unsigned long, int));
#ifndef __STRICT_ANSI__
long long

View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)unistd.h 8.10 (Berkeley) 4/16/94
* @(#)unistd.h 8.12 (Berkeley) 4/27/95
*/
#ifndef _UNISTD_H_
@ -95,6 +95,10 @@ char *ttyname __P((int));
int unlink __P((const char *));
ssize_t write __P((int, const void *, size_t));
extern char *optarg; /* getopt(3) external variables */
extern int optind, opterr, optopt;
int getopt __P((int, char * const [], const char *));
#ifndef _POSIX_SOURCE
#ifdef __STDC__
struct timeval; /* select(2) */
@ -169,9 +173,13 @@ off_t __syscall __P((quad_t, ...));
int truncate __P((const char *, off_t));
int ttyslot __P((void));
unsigned int ualarm __P((unsigned int, unsigned int));
int unwhiteout __P((const char *));
void usleep __P((unsigned int));
void *valloc __P((size_t)); /* obsoleted by malloc() */
pid_t vfork __P((void));
extern char *suboptarg; /* getsubopt(3) external variable */
int getsubopt __P((char **, char * const *, char **));
#endif /* !_POSIX_SOURCE */
__END_DECLS