fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-04-24 23:02:14 +00:00
Code Issues Projects Releases Wiki Activity

fix various header namespace issues under feature-test-macro control

Browse Source 
reported and changes suggested by Daniel Sabogal.
This commit is contained in:
Rich Felker 2016-10-20 17:20:01 -04:00
parent 2ed4e9d927
commit 7597fc25a2
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/dirent.h
View File

@ -33,13 +33,16 @@ DIR *opendir(const char *);
struct dirent *readdir(DIR *); struct dirent *readdir(DIR *);
int readdir_r(DIR *__restrict, struct dirent *__restrict, struct dirent **__restrict); int readdir_r(DIR *__restrict, struct dirent *__restrict, struct dirent **__restrict);
void rewinddir(DIR *); void rewinddir(DIR *);
void seekdir(DIR *, long);
long telldir(DIR *);
int dirfd(DIR *); int dirfd(DIR *);
int alphasort(const struct dirent **, const struct dirent **); int alphasort(const struct dirent **, const struct dirent **);
int scandir(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **)); int scandir(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **));
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
void seekdir(DIR *, long);
long telldir(DIR *);
#endif
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define DT_UNKNOWN 0 #define DT_UNKNOWN 0
#define DT_FIFO 1 #define DT_FIFO 1

2
include/grp.h
View File

@ -29,9 +29,11 @@ struct group *getgrnam(const char *);
int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **); int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **);
int getgrnam_r(const char *, struct group *, char *, size_t, struct group **); int getgrnam_r(const char *, struct group *, char *, size_t, struct group **);
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
struct group *getgrent(void); struct group *getgrent(void);
void endgrent(void); void endgrent(void);
void setgrent(void); void setgrent(void);
#endif
#ifdef _GNU_SOURCE #ifdef _GNU_SOURCE
struct group *fgetgrent(FILE *); struct group *fgetgrent(FILE *);

2
include/pwd.h
View File

@ -27,9 +27,11 @@ struct passwd {
char *pw_shell; char *pw_shell;
}; };
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
void setpwent (void); void setpwent (void);
void endpwent (void); void endpwent (void);
struct passwd *getpwent (void); struct passwd *getpwent (void);
#endif
struct passwd *getpwuid (uid_t); struct passwd *getpwuid (uid_t);
struct passwd *getpwnam (const char *); struct passwd *getpwnam (const char *);

7
include/sys/stat.h
View File

@ -79,12 +79,15 @@ int fchmod(int, mode_t);
int fchmodat(int, const char *, mode_t, int); int fchmodat(int, const char *, mode_t, int);
mode_t umask(mode_t); mode_t umask(mode_t);
int mkdir(const char *, mode_t); int mkdir(const char *, mode_t);
int mknod(const char *, mode_t, dev_t);
int mkfifo(const char *, mode_t); int mkfifo(const char *, mode_t);
int mkdirat(int, const char *, mode_t); int mkdirat(int, const char *, mode_t);
int mknodat(int, const char *, mode_t, dev_t);
int mkfifoat(int, const char *, mode_t); int mkfifoat(int, const char *, mode_t);
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
int mknod(const char *, mode_t, dev_t);
int mknodat(int, const char *, mode_t, dev_t);
#endif
int futimens(int, const struct timespec [2]); int futimens(int, const struct timespec [2]);
int utimensat(int, const char *, const struct timespec [2], int); int utimensat(int, const char *, const struct timespec [2], int);

3
include/time.h
View File

@ -111,6 +111,8 @@ int timer_settime (timer_t, int, const struct itimerspec *__restrict, struct iti
int timer_gettime (timer_t, struct itimerspec *); int timer_gettime (timer_t, struct itimerspec *);
int timer_getoverrun (timer_t); int timer_getoverrun (timer_t);
extern char *tzname[2];
#endif #endif
@ -118,7 +120,6 @@ int timer_getoverrun (timer_t);
char *strptime (const char *__restrict, const char *__restrict, struct tm *__restrict); char *strptime (const char *__restrict, const char *__restrict, struct tm *__restrict);
extern int daylight; extern int daylight;
extern long timezone; extern long timezone;
extern char *tzname[2];
extern int getdate_err; extern int getdate_err;
struct tm *getdate (const char *); struct tm *getdate (const char *);
#endif #endif

4
include/unistd.h
View File

@ -110,10 +110,8 @@ gid_t getgid(void);
gid_t getegid(void); gid_t getegid(void);
int getgroups(int, gid_t []); int getgroups(int, gid_t []);
int setuid(uid_t); int setuid(uid_t);
int setreuid(uid_t, uid_t);
int seteuid(uid_t); int seteuid(uid_t);
int setgid(gid_t); int setgid(gid_t);
int setregid(gid_t, gid_t);
int setegid(gid_t); int setegid(gid_t);
char *getlogin(void); char *getlogin(void);
@ -136,6 +134,8 @@ size_t confstr(int, char *, size_t);
#define F_TEST 3 #define F_TEST 3
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
int setreuid(uid_t, uid_t);
int setregid(gid_t, gid_t);
int lockf(int, int, off_t); int lockf(int, int, off_t);
long gethostid(void); long gethostid(void);
int nice(int); int nice(int);