enable musl build, patches via lua script from alpinelinux

61 files changed, 3116 insertions, 11 deletions

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 08d545c79..2c3c17bc3 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ppp
 PKG_VERSION:=		2.4.5
-PKG_RELEASE:=		6
+PKG_RELEASE:=		7
 PKG_MD5SUM:=		4621bc56167b6953ec4071043fe0ec57
 PKG_DESCR:=		Point-to-Point Protocol software
 PKG_SECTION:=		ppp
@@ -15,8 +15,6 @@ PKG_URL:=		http://ppp.samba.org/
 PKG_SITES:=		ftp://ftp.samba.org/pub/ppp/
 PKG_MULTI:=		1
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
-
 PKG_SUBPKGS:=		PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS
 PKG_SUBPKGS+=		PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS
 PKGSS_PPP_MOD_PPPOE:=	kmod-pppoe
diff --git a/package/ppp/patches/patch-chat_chat_c b/package/ppp/patches/patch-chat_chat_c
new file mode 100644
index 000000000..2718fbd8d
--- /dev/null
+++ b/package/ppp/patches/patch-chat_chat_c
@@ -0,0 +1,74 @@
+--- ppp-2.4.5.orig/chat/chat.c	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/chat/chat.c	2014-03-17 16:13:08.000000000 +0100
+@@ -209,39 +209,39 @@ int clear_report_next = 0;
+ 
+ int say_next = 0, hup_next = 0;
+ 
+-void *dup_mem __P((void *b, size_t c));
+-void *copy_of __P((char *s));
+-char *grow __P((char *s, char **p, size_t len));
+-void usage __P((void));
+-void msgf __P((const char *fmt, ...));
+-void fatal __P((int code, const char *fmt, ...));
+-SIGTYPE sigalrm __P((int signo));
+-SIGTYPE sigint __P((int signo));
+-SIGTYPE sigterm __P((int signo));
+-SIGTYPE sighup __P((int signo));
+-void unalarm __P((void));
+-void init __P((void));
+-void set_tty_parameters __P((void));
+-void echo_stderr __P((int));
+-void break_sequence __P((void));
+-void terminate __P((int status));
+-void do_file __P((char *chat_file));
+-int  get_string __P((register char *string));
+-int  put_string __P((register char *s));
+-int  write_char __P((int c));
+-int  put_char __P((int c));
+-int  get_char __P((void));
+-void chat_send __P((register char *s));
+-char *character __P((int c));
+-void chat_expect __P((register char *s));
+-char *clean __P((register char *s, int sending));
+-void break_sequence __P((void));
+-void terminate __P((int status));
+-void pack_array __P((char **array, int end));
+-char *expect_strtok __P((char *, char *));
+-int vfmtmsg __P((char *, int, const char *, va_list));	/* vsprintf++ */
++void *dup_mem (void *b, size_t c);
++void *copy_of (char *s);
++char *grow (char *s, char **p, size_t len);
++void usage (void);
++void msgf (const char *fmt, ...);
++void fatal (int code, const char *fmt, ...);
++SIGTYPE sigalrm (int signo);
++SIGTYPE sigint (int signo);
++SIGTYPE sigterm (int signo);
++SIGTYPE sighup (int signo);
++void unalarm (void);
++void init (void);
++void set_tty_parameters (void);
++void echo_stderr (int);
++void break_sequence (void);
++void terminate (int status);
++void do_file (char *chat_file);
++int  get_string (register char *string);
++int  put_string (register char *s);
++int  write_char (int c);
++int  put_char (int c);
++int  get_char (void);
++void chat_send (register char *s);
++char *character (int c);
++void chat_expect (register char *s);
++char *clean (register char *s, int sending);
++void break_sequence (void);
++void terminate (int status);
++void pack_array (char **array, int end);
++char *expect_strtok (char *, char *);
++int vfmtmsg (char *, int, const char *, va_list);	/* vsprintf++ */
+ 
+-int main __P((int, char *[]));
++int main (int, char *[]);
+ 
+ void *dup_mem(b, c)
+ void *b;
diff --git a/package/ppp/patches/patch-include_net_if_ppp_h b/package/ppp/patches/patch-include_net_if_ppp_h
new file mode 100644
index 000000000..6741e64c8
--- /dev/null
+++ b/package/ppp/patches/patch-include_net_if_ppp_h
@@ -0,0 +1,12 @@
+--- ppp-2.4.5.orig/include/net/if_ppp.h	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/include/net/if_ppp.h	2014-03-17 16:13:06.000000000 +0100
+@@ -150,7 +150,7 @@ struct ifpppcstatsreq {
+ #endif
+ 
+ #if (defined(_KERNEL) || defined(KERNEL)) && !defined(NeXT)
+-void pppattach __P((void));
+-void pppintr __P((void));
++void pppattach (void);
++void pppintr (void);
+ #endif
+ #endif /* _IF_PPP_H_ */
diff --git a/package/ppp/patches/patch-include_net_ppp-comp_h b/package/ppp/patches/patch-include_net_ppp-comp_h
new file mode 100644
index 000000000..42e9562b5
--- /dev/null
+++ b/package/ppp/patches/patch-include_net_ppp-comp_h
@@ -0,0 +1,56 @@
+--- ppp-2.4.5.orig/include/net/ppp-comp.h	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/include/net/ppp-comp.h	2014-03-17 16:13:07.000000000 +0100
+@@ -59,36 +59,36 @@ struct compressor {
+ 	int	compress_proto;	/* CCP compression protocol number */
+ 
+ 	/* Allocate space for a compressor (transmit side) */
+-	void	*(*comp_alloc) __P((u_char *options, int opt_len));
++	void	*(*comp_alloc) (u_char *options, int opt_len);
+ 	/* Free space used by a compressor */
+-	void	(*comp_free) __P((void *state));
++	void	(*comp_free) (void *state);
+ 	/* Initialize a compressor */
+-	int	(*comp_init) __P((void *state, u_char *options, int opt_len,
+-				  int unit, int hdrlen, int debug));
++	int	(*comp_init) (void *state, u_char *options, int opt_len,
++				  int unit, int hdrlen, int debug);
+ 	/* Reset a compressor */
+-	void	(*comp_reset) __P((void *state));
++	void	(*comp_reset) (void *state);
+ 	/* Compress a packet */
+-	int	(*compress) __P((void *state, PACKETPTR *mret,
+-				 PACKETPTR mp, int orig_len, int max_len));
++	int	(*compress) (void *state, PACKETPTR *mret,
++				 PACKETPTR mp, int orig_len, int max_len);
+ 	/* Return compression statistics */
+-	void	(*comp_stat) __P((void *state, struct compstat *stats));
++	void	(*comp_stat) (void *state, struct compstat *stats);
+ 
+ 	/* Allocate space for a decompressor (receive side) */
+-	void	*(*decomp_alloc) __P((u_char *options, int opt_len));
++	void	*(*decomp_alloc) (u_char *options, int opt_len);
+ 	/* Free space used by a decompressor */
+-	void	(*decomp_free) __P((void *state));
++	void	(*decomp_free) (void *state);
+ 	/* Initialize a decompressor */
+-	int	(*decomp_init) __P((void *state, u_char *options, int opt_len,
+-				    int unit, int hdrlen, int mru, int debug));
++	int	(*decomp_init) (void *state, u_char *options, int opt_len,
++				    int unit, int hdrlen, int mru, int debug);
+ 	/* Reset a decompressor */
+-	void	(*decomp_reset) __P((void *state));
++	void	(*decomp_reset) (void *state);
+ 	/* Decompress a packet. */
+-	int	(*decompress) __P((void *state, PACKETPTR mp,
+-				   PACKETPTR *dmpp));
++	int	(*decompress) (void *state, PACKETPTR mp,
++				   PACKETPTR *dmpp);
+ 	/* Update state for an incompressible packet received */
+-	void	(*incomp) __P((void *state, PACKETPTR mp));
++	void	(*incomp) (void *state, PACKETPTR mp);
+ 	/* Return decompression statistics */
+-	void	(*decomp_stat) __P((void *state, struct compstat *stats));
++	void	(*decomp_stat) (void *state, struct compstat *stats);
+ };
+ #endif /* PACKETPTR */
+ 
diff --git a/package/ppp/patches/patch-include_net_ppp_defs_h b/package/ppp/patches/patch-include_net_ppp_defs_h
new file mode 100644
index 000000000..1945c78d7
--- /dev/null
+++ b/package/ppp/patches/patch-include_net_ppp_defs_h
@@ -0,0 +1,11 @@
+--- ppp-2.4.5.orig/include/net/ppp_defs.h	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/include/net/ppp_defs.h	2014-03-17 16:32:53.000000000 +0100
+@@ -38,6 +38,8 @@
+ #ifndef _PPP_DEFS_H_
+ #define _PPP_DEFS_H_
+ 
++#include <sys/time.h>
++
+ /*
+  * The basic PPP frame.
+  */
diff --git a/package/ppp/patches/patch-include_net_slcompress_h b/package/ppp/patches/patch-include_net_slcompress_h
new file mode 100644
index 000000000..69d57d909
--- /dev/null
+++ b/package/ppp/patches/patch-include_net_slcompress_h
@@ -0,0 +1,22 @@
+--- ppp-2.4.5.orig/include/net/slcompress.h	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/include/net/slcompress.h	2014-03-17 16:13:06.000000000 +0100
+@@ -137,12 +137,12 @@ struct slcompress {
+ /* flag values */
+ #define SLF_TOSS 1		/* tossing rcvd frames because of input err */
+ 
+-void	sl_compress_init __P((struct slcompress *));
+-void	sl_compress_setup __P((struct slcompress *, int));
+-u_int	sl_compress_tcp __P((struct mbuf *,
+-	    struct ip *, struct slcompress *, int));
+-int	sl_uncompress_tcp __P((u_char **, int, u_int, struct slcompress *));
+-int	sl_uncompress_tcp_core __P((u_char *, int, int, u_int,
+-	    struct slcompress *, u_char **, u_int *));
++void	sl_compress_init (struct slcompress *);
++void	sl_compress_setup (struct slcompress *, int);
++u_int	sl_compress_tcp (struct mbuf *,
++	    struct ip *, struct slcompress *, int);
++int	sl_uncompress_tcp (u_char **, int, u_int, struct slcompress *);
++int	sl_uncompress_tcp_core (u_char *, int, int, u_int,
++	    struct slcompress *, u_char **, u_int *);
+ 
+ #endif /* _SLCOMPRESS_H_ */
diff --git a/package/ppp/patches/patch-include_net_vjcompress_h b/package/ppp/patches/patch-include_net_vjcompress_h
new file mode 100644
index 000000000..cc267c8ea
--- /dev/null
+++ b/package/ppp/patches/patch-include_net_vjcompress_h
@@ -0,0 +1,26 @@
+--- ppp-2.4.5.orig/include/net/vjcompress.h	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/include/net/vjcompress.h	2014-03-17 16:13:06.000000000 +0100
+@@ -130,15 +130,15 @@ struct vjcompress {
+ /* flag values */
+ #define VJF_TOSS 1		/* tossing rcvd frames because of input err */
+ 
+-extern void  vj_compress_init __P((struct vjcompress *comp, int max_state));
+-extern u_int vj_compress_tcp __P((struct ip *ip, u_int mlen,
++extern void  vj_compress_init (struct vjcompress *comp, int max_state);
++extern u_int vj_compress_tcp (struct ip *ip, u_int mlen,
+ 				struct vjcompress *comp, int compress_cid_flag,
+-				u_char **vjhdrp));
+-extern void  vj_uncompress_err __P((struct vjcompress *comp));
+-extern int   vj_uncompress_uncomp __P((u_char *buf, int buflen,
+-				struct vjcompress *comp));
+-extern int   vj_uncompress_tcp __P((u_char *buf, int buflen, int total_len,
++				u_char **vjhdrp);
++extern void  vj_uncompress_err (struct vjcompress *comp);
++extern int   vj_uncompress_uncomp (u_char *buf, int buflen,
++				struct vjcompress *comp);
++extern int   vj_uncompress_tcp (u_char *buf, int buflen, int total_len,
+ 				struct vjcompress *comp, u_char **hdrp,
+-				u_int *hlenp));
++				u_int *hlenp);
+ 
+ #endif /* _VJCOMPRESS_H_ */
diff --git a/package/ppp/patches/patch-modules_bsd-comp_c b/package/ppp/patches/patch-modules_bsd-comp_c
new file mode 100644
index 000000000..4bba327c7
--- /dev/null
+++ b/package/ppp/patches/patch-modules_bsd-comp_c
@@ -0,0 +1,35 @@
+--- ppp-2.4.5.orig/modules/bsd-comp.c	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/modules/bsd-comp.c	2014-03-17 16:13:07.000000000 +0100
+@@ -148,19 +148,19 @@ struct bsd_db {
+ #define BSD_OVHD	2		/* BSD compress overhead/packet */
+ #define BSD_INIT_BITS	BSD_MIN_BITS
+ 
+-static void	*bsd_comp_alloc __P((u_char *options, int opt_len));
+-static void	*bsd_decomp_alloc __P((u_char *options, int opt_len));
+-static void	bsd_free __P((void *state));
+-static int	bsd_comp_init __P((void *state, u_char *options, int opt_len,
+-				   int unit, int hdrlen, int debug));
+-static int	bsd_decomp_init __P((void *state, u_char *options, int opt_len,
+-				     int unit, int hdrlen, int mru, int debug));
+-static int	bsd_compress __P((void *state, mblk_t **mret,
+-				  mblk_t *mp, int slen, int maxolen));
+-static void	bsd_incomp __P((void *state, mblk_t *dmsg));
+-static int	bsd_decompress __P((void *state, mblk_t *cmp, mblk_t **dmpp));
+-static void	bsd_reset __P((void *state));
+-static void	bsd_comp_stats __P((void *state, struct compstat *stats));
++static void	*bsd_comp_alloc (u_char *options, int opt_len);
++static void	*bsd_decomp_alloc (u_char *options, int opt_len);
++static void	bsd_free (void *state);
++static int	bsd_comp_init (void *state, u_char *options, int opt_len,
++				   int unit, int hdrlen, int debug);
++static int	bsd_decomp_init (void *state, u_char *options, int opt_len,
++				     int unit, int hdrlen, int mru, int debug);
++static int	bsd_compress (void *state, mblk_t **mret,
++				  mblk_t *mp, int slen, int maxolen);
++static void	bsd_incomp (void *state, mblk_t *dmsg);
++static int	bsd_decompress (void *state, mblk_t *cmp, mblk_t **dmpp);
++static void	bsd_reset (void *state);
++static void	bsd_comp_stats (void *state, struct compstat *stats);
+ 
+ /*
+  * Procedures exported to ppp_comp.c.
diff --git a/package/ppp/patches/patch-modules_deflate_c b/package/ppp/patches/patch-modules_deflate_c
new file mode 100644
index 000000000..53cd6fc0e
--- /dev/null
+++ b/package/ppp/patches/patch-modules_deflate_c
@@ -0,0 +1,47 @@
+--- ppp-2.4.5.orig/modules/deflate.c	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/modules/deflate.c	2014-03-17 16:13:07.000000000 +0100
+@@ -80,25 +80,25 @@ struct deflate_state {
+ 
+ #define DEFLATE_OVHD	2		/* Deflate overhead/packet */
+ 
+-static void	*z_alloc __P((void *, u_int items, u_int size));
+-static void	*z_alloc_init __P((void *, u_int items, u_int size));
+-static void	z_free __P((void *, void *ptr));
+-static void	*z_comp_alloc __P((u_char *options, int opt_len));
+-static void	*z_decomp_alloc __P((u_char *options, int opt_len));
+-static void	z_comp_free __P((void *state));
+-static void	z_decomp_free __P((void *state));
+-static int	z_comp_init __P((void *state, u_char *options, int opt_len,
+-				 int unit, int hdrlen, int debug));
+-static int	z_decomp_init __P((void *state, u_char *options, int opt_len,
+-				     int unit, int hdrlen, int mru, int debug));
+-static int	z_compress __P((void *state, mblk_t **mret,
+-				  mblk_t *mp, int slen, int maxolen));
+-static void	z_incomp __P((void *state, mblk_t *dmsg));
+-static int	z_decompress __P((void *state, mblk_t *cmp,
+-				    mblk_t **dmpp));
+-static void	z_comp_reset __P((void *state));
+-static void	z_decomp_reset __P((void *state));
+-static void	z_comp_stats __P((void *state, struct compstat *stats));
++static void	*z_alloc (void *, u_int items, u_int size);
++static void	*z_alloc_init (void *, u_int items, u_int size);
++static void	z_free (void *, void *ptr);
++static void	*z_comp_alloc (u_char *options, int opt_len);
++static void	*z_decomp_alloc (u_char *options, int opt_len);
++static void	z_comp_free (void *state);
++static void	z_decomp_free (void *state);
++static int	z_comp_init (void *state, u_char *options, int opt_len,
++				 int unit, int hdrlen, int debug);
++static int	z_decomp_init (void *state, u_char *options, int opt_len,
++				     int unit, int hdrlen, int mru, int debug);
++static int	z_compress (void *state, mblk_t **mret,
++				  mblk_t *mp, int slen, int maxolen);
++static void	z_incomp (void *state, mblk_t *dmsg);
++static int	z_decompress (void *state, mblk_t *cmp,
++				    mblk_t **dmpp);
++static void	z_comp_reset (void *state);
++static void	z_decomp_reset (void *state);
++static void	z_comp_stats (void *state, struct compstat *stats);
+ 
+ /*
+  * Procedures exported to ppp_comp.c.
diff --git a/package/ppp/patches/patch-modules_if_ppp_c b/package/ppp/patches/patch-modules_if_ppp_c
new file mode 100644
index 000000000..67561642a
--- /dev/null
+++ b/package/ppp/patches/patch-modules_if_ppp_c
@@ -0,0 +1,43 @@
+--- ppp-2.4.5.orig/modules/if_ppp.c	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/modules/if_ppp.c	2014-03-17 16:13:07.000000000 +0100
+@@ -80,10 +80,10 @@
+ 
+ #define ifr_mtu		ifr_metric
+ 
+-static int if_ppp_open __P((queue_t *, int, int, int));
+-static int if_ppp_close __P((queue_t *, int));
+-static int if_ppp_wput __P((queue_t *, mblk_t *));
+-static int if_ppp_rput __P((queue_t *, mblk_t *));
++static int if_ppp_open (queue_t *, int, int, int);
++static int if_ppp_close (queue_t *, int);
++static int if_ppp_wput (queue_t *, mblk_t *);
++static int if_ppp_rput (queue_t *, mblk_t *);
+ 
+ #define PPP_IF_ID 0x8021
+ static struct module_info minfo = {
+@@ -117,11 +117,11 @@ static int ppp_nalloc;		/* Number of ele
+ static struct ifnet **ifs;	/* Array of pointers to interface structs */
+ static if_ppp_t **states;	/* Array of pointers to state structs */
+ 
+-static int if_ppp_output __P((struct ifnet *, struct mbuf *,
+-			      struct sockaddr *));
+-static int if_ppp_ioctl __P((struct ifnet *, u_int, caddr_t));
+-static struct mbuf *make_mbufs __P((mblk_t *, int));
+-static mblk_t *make_message __P((struct mbuf *, int));
++static int if_ppp_output (struct ifnet *, struct mbuf *,
++			      struct sockaddr *);
++static int if_ppp_ioctl (struct ifnet *, u_int, caddr_t);
++static struct mbuf *make_mbufs (mblk_t *, int);
++static mblk_t *make_message (struct mbuf *, int);
+ 
+ #ifdef SNIT_SUPPORT
+ /* Fake ether header for SNIT */
+@@ -129,7 +129,7 @@ static struct ether_header snit_ehdr = {
+ #endif
+ 
+ #ifndef __osf__
+-static void ppp_if_detach __P((struct ifnet *));
++static void ppp_if_detach (struct ifnet *);
+ 
+ /*
+  * Detach all the interfaces before unloading.
diff --git a/package/ppp/patches/patch-modules_ppp_ahdlc_c b/package/ppp/patches/patch-modules_ppp_ahdlc_c
new file mode 100644
index 000000000..93ad5795a
--- /dev/null
+++ b/package/ppp/patches/patch-modules_ppp_ahdlc_c
@@ -0,0 +1,19 @@
+--- ppp-2.4.5.orig/modules/ppp_ahdlc.c	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/modules/ppp_ahdlc.c	2014-03-17 16:13:07.000000000 +0100
+@@ -107,11 +107,11 @@ typedef unsigned int            uintpoin
+ 
+ MOD_OPEN_DECL(ahdlc_open);
+ MOD_CLOSE_DECL(ahdlc_close);
+-static int ahdlc_wput __P((queue_t *, mblk_t *));
+-static int ahdlc_rput __P((queue_t *, mblk_t *));
+-static void ahdlc_encode __P((queue_t *, mblk_t *));
+-static void ahdlc_decode __P((queue_t *, mblk_t *));
+-static int msg_byte __P((mblk_t *, unsigned int));
++static int ahdlc_wput (queue_t *, mblk_t *);
++static int ahdlc_rput (queue_t *, mblk_t *);
++static void ahdlc_encode (queue_t *, mblk_t *);
++static void ahdlc_decode (queue_t *, mblk_t *);
++static int msg_byte (mblk_t *, unsigned int);
+ 
+ #if defined(SOL2)
+ /*
diff --git a/package/ppp/patches/patch-modules_ppp_c b/package/ppp/patches/patch-modules_ppp_c
new file mode 100644
index 000000000..f8c569cad
--- /dev/null
+++ b/package/ppp/patches/patch-modules_ppp_c
@@ -0,0 +1,76 @@
+--- ppp-2.4.5.orig/modules/ppp.c	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/modules/ppp.c	2014-03-17 16:13:07.000000000 +0100
+@@ -254,43 +254,43 @@ static upperstr_t *minor_devs = NULL;
+ static upperstr_t *ppas = NULL;
+ 
+ #ifdef SVR4
+-static int pppopen __P((queue_t *, dev_t *, int, int, cred_t *));
+-static int pppclose __P((queue_t *, int, cred_t *));
++static int pppopen (queue_t *, dev_t *, int, int, cred_t *);
++static int pppclose (queue_t *, int, cred_t *);
+ #else
+-static int pppopen __P((queue_t *, int, int, int));
+-static int pppclose __P((queue_t *, int));
++static int pppopen (queue_t *, int, int, int);
++static int pppclose (queue_t *, int);
+ #endif /* SVR4 */
+-static int pppurput __P((queue_t *, mblk_t *));
+-static int pppuwput __P((queue_t *, mblk_t *));
+-static int pppursrv __P((queue_t *));
+-static int pppuwsrv __P((queue_t *));
+-static int ppplrput __P((queue_t *, mblk_t *));
+-static int ppplwput __P((queue_t *, mblk_t *));
+-static int ppplrsrv __P((queue_t *));
+-static int ppplwsrv __P((queue_t *));
++static int pppurput (queue_t *, mblk_t *);
++static int pppuwput (queue_t *, mblk_t *);
++static int pppursrv (queue_t *);
++static int pppuwsrv (queue_t *);
++static int ppplrput (queue_t *, mblk_t *);
++static int ppplwput (queue_t *, mblk_t *);
++static int ppplrsrv (queue_t *);
++static int ppplwsrv (queue_t *);
+ #ifndef NO_DLPI
+-static void dlpi_request __P((queue_t *, mblk_t *, upperstr_t *));
+-static void dlpi_error __P((queue_t *, upperstr_t *, int, int, int));
+-static void dlpi_ok __P((queue_t *, int));
++static void dlpi_request (queue_t *, mblk_t *, upperstr_t *);
++static void dlpi_error (queue_t *, upperstr_t *, int, int, int);
++static void dlpi_ok (queue_t *, int);
+ #endif
+-static int send_data __P((mblk_t *, upperstr_t *));
+-static void new_ppa __P((queue_t *, mblk_t *));
+-static void attach_ppa __P((queue_t *, mblk_t *));
+-static void detach_ppa __P((queue_t *, mblk_t *));
+-static void detach_lower __P((queue_t *, mblk_t *));
+-static void debug_dump __P((queue_t *, mblk_t *));
+-static upperstr_t *find_dest __P((upperstr_t *, int));
++static int send_data (mblk_t *, upperstr_t *);
++static void new_ppa (queue_t *, mblk_t *);
++static void attach_ppa (queue_t *, mblk_t *);