am a7dc7600: Merge "Fix linkage of grantpt(3)."

* commit 'a7dc7600fe1be1f3fd61856b407bb7065307e711':
  Fix linkage of grantpt(3).
This commit is contained in:
Elliott Hughes
2014-07-29 17:52:05 +00:00
committed by Android Git Automerger
9 changed files with 184 additions and 169 deletions

View File

@@ -120,18 +120,12 @@ long random(void);
char* setstate(char*);
void srandom(unsigned int);
/* Basic PTY functions. These only work if devpts is mounted! */
extern int unlockpt(int);
extern char* ptsname(int);
extern int ptsname_r(int, char*, size_t);
extern int getpt(void);
static __inline__ int grantpt(int __fd __attribute((unused)))
{
(void)__fd;
return 0; /* devpts does this all for us! */
}
int getpt(void);
int grantpt(int);
int posix_openpt(int);
char* ptsname(int) __warnattr("ptsname is not thread-safe; use ptsname_r instead");
int ptsname_r(int, char*, size_t);
int unlockpt(int);
typedef struct {
int quot;

View File

@@ -170,7 +170,7 @@ extern char *optarg;
extern int optind, opterr, optopt;
extern int isatty(int);
extern char* ttyname(int);
extern char* ttyname(int) __warnattr("ttyname is not thread-safe; use ttyname_r instead");
extern int ttyname_r(int, char*, size_t);
extern int acct(const char* filepath);