X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=modules%2Fppp_mod.h;h=f0af008861ef0f1972a126ee71e65b09cef1bf4b;hp=59b940f62a4b8e70181cbd8fb0ebba8c5809baf6;hb=8592783058509b5493a42f3b0432fcbaab55c994;hpb=a51ffdeea95fdbbb21555408d3e5002ad7069c8a

diff --git a/modules/ppp_mod.h b/modules/ppp_mod.h
index 59b940f..f0af008 100644
--- a/modules/ppp_mod.h
+++ b/modules/ppp_mod.h
@@ -10,7 +10,6 @@
 #define ALLOC_SLEEP(n)		kmem_alloc((n), KM_SLEEP)
 #define ALLOC_NOSLEEP(n)	kmem_alloc((n), KM_NOSLEEP)
 #define FREE(p, n)		kmem_free((p), (n))
-#define NOTSUSER()		(suser()? 0: EPERM)
 #endif
 
 #ifdef SUNOS4
@@ -19,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__
@@ -40,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
@@ -54,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__ */
 
@@ -70,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