xnu-2782.40.9.tar.gz

[apple/xnu.git] / bsd / netkey / keysock.h

diff --git a/bsd/netkey/keysock.h b/bsd/netkey/keysock.h
index f176d1a205ada6e6d45a77782b492c42516518e2..32d8ef55930b573efcffd78e59e8043ae86dc301 100644 (file)
--- a/bsd/netkey/keysock.h
+++ b/bsd/netkey/keysock.h
@@ -62,8 +62,10 @@ struct pfkeystat {
 #define KEY_SENDUP_ALL         1
 #define KEY_SENDUP_REGISTERED  2
 
-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
+#define PFKEY_STAT_INCREMENT(x)         \
+       {lck_mtx_lock(pfkey_stat_mutex); (x)++; lck_mtx_unlock(pfkey_stat_mutex);}
+
 struct keycb {
        struct rawcb kp_raw;    /* rawcb */
        int kp_promisc;         /* promiscuous mode */
@@ -73,16 +75,15 @@ struct keycb {
 extern struct pfkeystat pfkeystat;
 
 #ifdef __APPLE__
-extern int key_output __P((struct mbuf *, struct socket* so));
+extern int key_output(struct mbuf *, struct socket* so);
 #else
-extern int key_output __P((struct mbuf *, ...));
+extern int key_output(struct mbuf *, ...);
 #endif
-extern int key_usrreq __P((struct socket *,
-       int, struct mbuf *, struct mbuf *, struct mbuf *));
+extern int key_usrreq(struct socket *,
+       int, struct mbuf *, struct mbuf *, struct mbuf *);
 
-extern int key_sendup __P((struct socket *, struct sadb_msg *, u_int, int));
-extern int key_sendup_mbuf __P((struct socket *, struct mbuf *, int));
-#endif /* __APPLE_API_PRIVATE */
-#endif /* KERNEL */
+extern int key_sendup(struct socket *, struct sadb_msg *, u_int, int);
+extern int key_sendup_mbuf(struct socket *, struct mbuf *, int);
+#endif /* BSD_KERNEL_PRIVATE */
 
 #endif /*_NETKEY_KEYSOCK_H_*/