Remove declarations for things that don't exist.

The <grp.h> ones prevent gdb from building out of the box.

(cherry picked from commit f4c1a36a4500bc7f12e3065be3da4e8669ee011d)

Change-Id: I6958f2f1731de8c03df20b383decd414b78100aa

diff --git a/libc/include/grp.h b/libc/include/grp.h
index 86d99f3..fc4d520 100644 (file)
--- a/libc/include/grp.h
+++ b/libc/include/grp.h
@@ -43,10 +43,6 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
-#if __BSD_VISIBLE
-#define        _PATH_GROUP             "/etc/group"
-#endif
-
 struct group {
        char    *gr_name;               /* group name */
        char    *gr_passwd;             /* group password */
@@ -57,7 +53,7 @@ struct group {
 __BEGIN_DECLS
 struct group   *getgrgid(gid_t);
 struct group   *getgrnam(const char *);
-#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XPG_VISIBLE
+#if __POSIX_VISIBLE >= 200112 || __XPG_VISIBLE
 struct group   *getgrent(void);
 void            setgrent(void);
 void            endgrent(void);
@@ -66,11 +62,6 @@ int           getgrgid_r(gid_t, struct group *, char *,
 int             getgrnam_r(const char *, struct group *, char *,
                    size_t, struct group **);
 #endif
-#if __BSD_VISIBLE
-void            setgrfile(const char *);
-int             setgroupent(int);
-char           *group_from_gid(gid_t, int);
-#endif
 
 int   getgrouplist (const char *user, gid_t group,
                   gid_t *groups, int *ngroups);

diff --git a/libc/include/stdio.h b/libc/include/stdio.h
index e532de4..9c6bd3f 100644 (file)
--- a/libc/include/stdio.h
+++ b/libc/include/stdio.h
@@ -223,12 +223,6 @@ ssize_t     getdelim(char ** __restrict, size_t * __restrict, int,
            FILE * __restrict);
 ssize_t         getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
 
-#if __BSD_VISIBLE && !defined(__SYS_ERRLIST)
-#define __SYS_ERRLIST
-extern int sys_nerr;                   /* perror(3) external variables */
-extern char *sys_errlist[];
-#endif
-
 void    perror(const char *);
 int     printf(const char * __restrict, ...)
                __printflike(1, 2);
@@ -300,9 +294,6 @@ __END_DECLS
 #define        L_ctermid       1024    /* size for ctermid(); PATH_MAX */
 
 __BEGIN_DECLS
-#if 0 /* MISSING FROM BIONIC */
-char   *ctermid(char *);
-#endif /* MISSING */
 FILE   *fdopen(int, const char *);
 int     fileno(FILE *);
 

diff --git a/libc/include/stdlib.h b/libc/include/stdlib.h
index 857d631..e29fdba 100644 (file)
--- a/libc/include/stdlib.h
+++ b/libc/include/stdlib.h
@@ -163,10 +163,6 @@ extern size_t      wcstombs(char *, const wchar_t *, size_t);
 
 #define MB_CUR_MAX 4U
 
-#if 0 /* MISSING FROM BIONIC */
-extern int on_exit(void (*)(int, void *), void *);
-#endif /* MISSING */
-
 __END_DECLS
 
 #endif /* _STDLIB_H_ */

diff --git a/libc/include/unistd.h b/libc/include/unistd.h
index 82c53e8..7fbafdf 100644 (file)
--- a/libc/include/unistd.h
+++ b/libc/include/unistd.h
@@ -189,16 +189,6 @@ extern int cacheflush(long, long, long);
 extern pid_t tcgetpgrp(int fd);
 extern int   tcsetpgrp(int fd, pid_t _pid);
 
-#if 0 /* MISSING FROM BIONIC */
-extern int execlpe(const char *, const char *, ...);
-extern int getfsuid(uid_t);
-extern int setfsuid(uid_t);
-extern int getlogin_r(char* name, size_t namesize);
-extern int sethostname(const char *, size_t);
-extern int getdomainname(char *, size_t);
-extern int setdomainname(const char *, size_t);
-#endif /* MISSING */
-
 /* Used to retry syscalls that can return EINTR. */
 #define TEMP_FAILURE_RETRY(exp) ({         \
     __typeof__(exp) _rc;                   \

diff --git a/libstdc++/include/cstdlib b/libstdc++/include/cstdlib
index bb6f5a5..bd1deae 100644 (file)
--- a/libstdc++/include/cstdlib
+++ b/libstdc++/include/cstdlib
@@ -42,9 +42,6 @@ namespace std {
 using ::exit;
 using ::abort;
 using ::atexit;
-#if 0 /* MISSING FROM BIONIC */
-using ::on_exit;
-#endif
 
 using ::getenv;
 using ::putenv;