X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fccp.h;h=3f00056f49f5cf59cacced730aaa607380972f73;hb=827e4952d6bcc8dd9c8fdda54a509e5b59685c34;hp=35961b9b75a46ea0eee7625d6958b24c7e52a11d;hpb=92c5612fdb77e83e49c524ae46110c129e13429e;p=ppp.git

diff --git a/pppd/ccp.h b/pppd/ccp.h
index 35961b9..3f00056 100644
--- a/pppd/ccp.h
+++ b/pppd/ccp.h
@@ -29,6 +29,9 @@
  *
  * $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 {
@@ -38,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;
 
@@ -51,3 +54,5 @@ extern ccp_options ccp_allowoptions[];
 extern ccp_options ccp_hisoptions[];
 
 extern struct protent ccp_protent;
+
+#endif