netifd: fix compile error when both libnl and libnl-tiny are built

[openwrt.git] / package / ppp / patches / 401-no_record_file.patch

diff --git a/package/ppp/patches/401-no_record_file.patch b/package/ppp/patches/401-no_record_file.patch
index 431fcac..6883720 100644 (file)
--- a/package/ppp/patches/401-no_record_file.patch
+++ b/package/ppp/patches/401-no_record_file.patch
@@ -1,6 +1,6 @@
 --- a/pppd/pppd.h
 +++ b/pppd/pppd.h
-@@ -308,7 +308,6 @@ extern int holdoff;        /* Dead time before 
+@@ -309,7 +309,6 @@ extern int holdoff;        /* Dead time before 
  extern bool   holdoff_specified; /* true if user gave a holdoff value */
  extern bool   notty;          /* Stdin/out is not a tty */
  extern char   *pty_socket;    /* Socket to connect to pty */
@@ -10,7 +10,7 @@
  extern char   linkname[MAXPATHLEN]; /* logical name for link */
 --- a/pppd/tty.c
 +++ b/pppd/tty.c
-@@ -144,7 +144,7 @@ char       *disconnect_script = NULL; /* Scrip
+@@ -145,7 +145,7 @@ char       *disconnect_script = NULL; /* Scrip
  char  *welcomer = NULL;       /* Script to run after phys link estab. */
  char  *ptycommand = NULL;     /* Command to run on other side of pty */
  bool  notty = 0;              /* Stdin/out is not a tty */
@@ -19,7 +19,7 @@
  int   max_data_rate;          /* max bytes/sec through charshunt */
  bool  sync_serial = 0;        /* Device is synchronous serial device */
  char  *pty_socket = NULL;     /* Socket to connect to pty */
-@@ -200,8 +200,10 @@ option_t tty_options[] = {
+@@ -201,8 +201,10 @@ option_t tty_options[] = {
        "Send and receive over socket, arg is host:port",
        OPT_PRIO | OPT_DEVNAM },