Merge pull request #361 from pali/rtnetlink-deduplicate

[ppp.git] / pppdump / ppp-comp.h

diff --git a/pppdump/ppp-comp.h b/pppdump/ppp-comp.h
index 4be51d0d572907a4ba1f8afc24cbc19efe3f71c5..0199b5fa7b5086166b0997335037296a904bfc1f 100644 (file)
--- a/pppdump/ppp-comp.h
+++ b/pppdump/ppp-comp.h
@@ -51,6 +51,12 @@
 #define DO_PREDICTOR_1 0
 #define DO_PREDICTOR_2 0
 
+#if defined(SOL2)
+#include <net/ppp_defs.h>
+#else
+#include <linux/ppp_defs.h>
+#endif
+
 /*
  * Structure giving methods for compression/decompression.
  */
@@ -58,21 +64,21 @@ struct compressor {
        int     compress_proto; /* CCP compression protocol number */
 
        /* 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, u_char *mp, int inlen,
-                                  u_char *dmp, int *outlen));
+       int     (*decompress)(void *state, u_char *mp, int inlen,
+                             u_char *dmp, int *outlen);
        /* Update state for an incompressible packet received */
-       void    (*incomp) __P((void *state, u_char *mp, int len));
+       void    (*incomp)(void *state, u_char *mp, int len);
        /* Return decompression statistics */
-       void    (*decomp_stat) __P((void *state, struct compstat *stats));
+       void    (*decomp_stat)(void *state, struct compstat *stats);
 };
 
 /*