X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=modules%2Fppp_mod.h;h=792c4d4fc5b5feb129dac73df19447d50e785670;hp=dfb0b5f92c50edd74656ddd356d6da3bb1b205c5;hb=HEAD;hpb=9d0012df9e0bbd3945de42842f38950a8426c518

diff --git a/modules/ppp_mod.h b/modules/ppp_mod.h
index dfb0b5f..792c4d4 100644
--- a/modules/ppp_mod.h
+++ b/modules/ppp_mod.h
@@ -18,6 +18,7 @@
 #define ALLOC_NOSLEEP(n)	kmem_alloc((n), KMEM_NOSLEEP)
 #define FREE(p, n)		kmem_free((p), (n))
 #define NOTSUSER()		(suser()? 0: EPERM)
+#define bcanputnext(q, band)	canputnext((q))
 #endif /* SunOS 4 */
 
 #ifdef __osf__
@@ -39,6 +40,8 @@
 #define ALLOC_NOSLEEP(n)	(void *)malloc((u_long)(n), BUCKETINDEX(n), M_DEVBUF, M_NOWAIT)
 #endif
 
+#define bcanputnext(q, band)	canputnext((q))
+
 #ifdef FREE
 #undef FREE
 #endif
@@ -53,7 +56,7 @@
 #include <sys/proc.h>
 #define NOTSUSER()		(suser(u.u_procp->p_rcred, &u.u_acflag) ? EPERM : 0)
 
-#include "ppp_osf.h"
+/* #include "ppp_osf.h" */
 
 #endif /* __osf__ */
 
@@ -69,16 +72,25 @@
  */
 #ifdef DEBUG
 #if defined(SVR4) || defined(__osf__)
+#if defined(SNI)
+#include <sys/strlog.h>
+#define STRLOG_ID		4712
+#define DPRINT(f)		strlog(STRLOG_ID, 0, 0, SL_TRACE, f)
+#define DPRINT1(f, a1)		strlog(STRLOG_ID, 0, 0, SL_TRACE, f, a1)
+#define DPRINT2(f, a1, a2)	strlog(STRLOG_ID, 0, 0, SL_TRACE, f, a1, a2)
+#define DPRINT3(f, a1, a2, a3)	strlog(STRLOG_ID, 0, 0, SL_TRACE, f, a1, a2, a3)
+#else
 #define DPRINT(f)		cmn_err(CE_CONT, f)
 #define DPRINT1(f, a1)		cmn_err(CE_CONT, f, a1)
 #define DPRINT2(f, a1, a2)	cmn_err(CE_CONT, f, a1, a2)
 #define DPRINT3(f, a1, a2, a3)	cmn_err(CE_CONT, f, a1, a2, a3)
+#endif /* SNI */
 #else
 #define DPRINT(f)		printf(f)
 #define DPRINT1(f, a1)		printf(f, a1)
 #define DPRINT2(f, a1, a2)	printf(f, a1, a2)
 #define DPRINT3(f, a1, a2, a3)	printf(f, a1, a2, a3)
-#endif /* SVR4 */
+#endif /* SVR4 or OSF */
 
 #else
 #define DPRINT(f)		0
@@ -131,10 +143,10 @@ typedef int minor_t;
  */
 #ifdef SVR4
 #define MOD_OPEN_DECL(name)	\
-static int name __P((queue_t *, dev_t *, int, int, cred_t *))
+static int name(queue_t *, dev_t *, int, int, cred_t *)
 
 #define MOD_CLOSE_DECL(name)	\
-static int name __P((queue_t *, int, cred_t *))
+static int name(queue_t *, int, cred_t *)
 
 #define MOD_OPEN(name)				\
 static int name(q, devp, flag, sflag, credp)	\
@@ -156,10 +168,10 @@ static int name(q, flag, credp)	\
 
 #else	/* not SVR4 */
 #define MOD_OPEN_DECL(name)	\
-static int name __P((queue_t *, int, int, int))
+static int name(queue_t *, int, int, int)
 
 #define MOD_CLOSE_DECL(name)	\
-static int name __P((queue_t *, int))
+static int name(queue_t *, int)
 
 #define MOD_OPEN(name)		\
 static int name(q, dev, flag, sflag)	\