xnu-3248.20.55.tar.gz

[apple/xnu.git] / bsd / net / ppp_comp.h

diff --git a/bsd/net/ppp_comp.h b/bsd/net/ppp_comp.h
index 475e85e67332bde4a8360e64069e9e940cf5d0f5..67af45e900c3467605370d68a8480d7d6f163a4c 100644 (file)
--- a/bsd/net/ppp_comp.h
+++ b/bsd/net/ppp_comp.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * ppp_comp.h - Definitions for doing PPP packet compression.
@@ -49,8 +55,7 @@
 
 #ifndef _NET_PPP_COMP_H
 #define _NET_PPP_COMP_H
-#include <sys/appleapiopts.h>
-#ifdef __APPLE_API_UNSTABLE
+#ifdef KERNEL_PRIVATE
 /*
  * The following symbols control whether we include code for
  * various compression methods.
@@ -72,36 +77,35 @@ 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 */
 
@@ -183,5 +187,5 @@ struct compressor {
 #define CI_PREDICTOR_2         2       /* config option for Predictor-2 */
 #define CILEN_PREDICTOR_2      2       /* length of its config option */
 
-#endif /* __APPLE_API_UNSTABLE */
+#endif /* KERNEL_PRIVATE */
 #endif /* _NET_PPP_COMP_H */