Header file reorganization and cleaning up the public API for pppd version 2.5.0...

[ppp.git] / pppd / ccp.h

diff --git a/pppd/ccp.h b/pppd/ccp.h
index 76446db007c00604120f7044cc67be520ad3650c..3f00056f49f5cf59cacced730aaa607380972f73 100644 (file)
--- a/pppd/ccp.h
+++ b/pppd/ccp.h
@@ -29,6 +29,10 @@
  *
  * $Id: ccp.h,v 1.12 2004/11/04 10:02:26 paulus Exp $
  */
+#ifndef PPP_CCP_H
+#define PPP_CCP_H
+
+#include "pppdconf.h"
 
 typedef struct ccp_options {
     bool bsd_compress;         /* do BSD Compress? */
@@ -37,9 +41,9 @@ typedef struct ccp_options {
     bool predictor_2;          /* do Predictor-2? */
     bool deflate_correct;      /* use correct code for deflate? */
     bool deflate_draft;                /* use draft RFC code for deflate? */
-    u_char mppe;               /* MPPE bitfield */
-    u_short bsd_bits;          /* # bits/code for BSD Compress */
-    u_short deflate_size;      /* lg(window size) for Deflate */
+    unsigned char mppe;                /* MPPE bitfield */
+    unsigned short bsd_bits;           /* # bits/code for BSD Compress */
+    unsigned short deflate_size;       /* lg(window size) for Deflate */
     short method;              /* code for chosen compression method */
 } ccp_options;
 
@@ -50,3 +54,5 @@ extern ccp_options ccp_allowoptions[];
 extern ccp_options ccp_hisoptions[];
 
 extern struct protent ccp_protent;
+
+#endif