OSDN Git Service
(root)
/
android-x86
/
external-ppp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix pppd to build with both old and uapi headers.
[android-x86/external-ppp.git]
/
pppd
/
sys-linux.c
diff --git
a/pppd/sys-linux.c
b/pppd/sys-linux.c
index
a4c43d1
..
8736534
100644
(file)
--- a/
pppd/sys-linux.c
+++ b/
pppd/sys-linux.c
@@
-111,6
+111,7
@@
#include <netinet/if_ether.h>
#else
#include <linux/types.h>
#include <netinet/if_ether.h>
#else
#include <linux/types.h>
+#include <linux/tty.h>
#include <linux/if.h>
#include <linux/if_arp.h>
#include <linux/route.h>
#include <linux/if.h>
#include <linux/if_arp.h>
#include <linux/route.h>
@@
-2561,7
+2562,7
@@
get_pty(master_fdp, slave_fdp, slave_name, uid)
if (mfd >= 0) {
int ptn;
if (ioctl(mfd, TIOCGPTN, &ptn) >= 0) {
if (mfd >= 0) {
int ptn;
if (ioctl(mfd, TIOCGPTN, &ptn) >= 0) {
- slprintf(pty_name, sizeof(pty_name), "/dev
.
pts/%d", ptn);
+ slprintf(pty_name, sizeof(pty_name), "/dev
/
pts/%d", ptn);
chmod(pty_name, S_IRUSR | S_IWUSR);
#ifdef TIOCSPTLCK
ptn = 0;
chmod(pty_name, S_IRUSR | S_IWUSR);
#ifdef TIOCSPTLCK
ptn = 0;