From fd093b1d4b1d57085e7cf7fa7291142e3fd04321 Mon Sep 17 00:00:00 2001
From: Kozlov Dmitry <dima@server>
Date: Fri, 15 Oct 2010 11:56:40 +0400
Subject: added linux_ppp.h

---
 accel-pptpd/include/linux_ppp.h   | 19 +++++++++++++++++++
 accel-pptpd/ppp/ccp_mppe.c        |  3 +--
 accel-pptpd/ppp/ipcp_opt_ipaddr.c |  3 +--
 accel-pptpd/ppp/lcp_opt_mru.c     |  3 +--
 accel-pptpd/ppp/ppp.c             |  6 ++----
 accel-pptpd/ppp/ppp_ccp.c         |  4 +---
 accel-pptpd/ppp/ppp_ipcp.c        |  4 +---
 accel-pptpd/ppp/ppp_lcp.c         |  4 +---
 accel-pptpd/radius/acct.c         |  4 ++--
 9 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 accel-pptpd/include/linux_ppp.h

(limited to 'accel-pptpd')

diff --git a/accel-pptpd/include/linux_ppp.h b/accel-pptpd/include/linux_ppp.h
new file mode 100644
index 00000000..533672b8
--- /dev/null
+++ b/accel-pptpd/include/linux_ppp.h
@@ -0,0 +1,19 @@
+#ifndef __KERNEL_PPP_H
+#define __KERNEL_PPP_H
+
+#include <linux/types.h>
+
+#ifndef aligned_u64
+#define aligned_u64 __u64 __attribute__((aligned(8)))
+#endif
+
+#ifndef __aligned_u64
+#define __aligned_u64 __u64 __attribute__((aligned(8)))
+#endif
+
+#include <linux/if.h>
+#include <linux/ppp_defs.h>
+#include <linux/if_ppp.h>
+
+#endif
+
diff --git a/accel-pptpd/ppp/ccp_mppe.c b/accel-pptpd/ppp/ccp_mppe.c
index 2f3e0836..2302c027 100644
--- a/accel-pptpd/ppp/ccp_mppe.c
+++ b/accel-pptpd/ppp/ccp_mppe.c
@@ -3,8 +3,7 @@
 #include <errno.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <net/if.h>
-#include <linux/if_ppp.h>
+#include "linux_ppp.h"
 
 #include "ppp.h"
 #include "ppp_ccp.h"
diff --git a/accel-pptpd/ppp/ipcp_opt_ipaddr.c b/accel-pptpd/ppp/ipcp_opt_ipaddr.c
index b2c1b8b3..3bec543d 100644
--- a/accel-pptpd/ppp/ipcp_opt_ipaddr.c
+++ b/accel-pptpd/ppp/ipcp_opt_ipaddr.c
@@ -4,9 +4,8 @@
 #include <errno.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
-#include <net/if.h>
 #include <sys/ioctl.h>
-#include <linux/if_ppp.h>
+#include "linux_ppp.h"
 
 #include "ppp.h"
 #include "ppp_ipcp.h"
diff --git a/accel-pptpd/ppp/lcp_opt_mru.c b/accel-pptpd/ppp/lcp_opt_mru.c
index 1af57e01..8f460a12 100644
--- a/accel-pptpd/ppp/lcp_opt_mru.c
+++ b/accel-pptpd/ppp/lcp_opt_mru.c
@@ -4,9 +4,8 @@
 #include <stdio.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#include <net/if.h>
-#include <linux/if_ppp.h>
 #include <sys/ioctl.h>
+#include "linux_ppp.h"
 
 #include "ppp.h"
 #include "ppp_lcp.h"
diff --git a/accel-pptpd/ppp/ppp.c b/accel-pptpd/ppp/ppp.c
index 9ba899f3..4fdcb01b 100644
--- a/accel-pptpd/ppp/ppp.c
+++ b/accel-pptpd/ppp/ppp.c
@@ -1,4 +1,3 @@
-
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -8,9 +7,8 @@
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
-#include <linux/ppp_defs.h>
-#include <linux/if.h>
-#include <linux/if_ppp.h>
+#include "linux_ppp.h"
+
 #include <openssl/md5.h>
 
 #include "triton.h"
diff --git a/accel-pptpd/ppp/ppp_ccp.c b/accel-pptpd/ppp/ppp_ccp.c
index de3270e3..af776e46 100644
--- a/accel-pptpd/ppp/ppp_ccp.c
+++ b/accel-pptpd/ppp/ppp_ccp.c
@@ -2,10 +2,8 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/socket.h>
-#include <linux/ppp_defs.h>
-#include <linux/if.h>
-#include <linux/if_ppp.h>
 #include <sys/ioctl.h>
+#include "linux_ppp.h"
 
 #include "triton.h"
 
diff --git a/accel-pptpd/ppp/ppp_ipcp.c b/accel-pptpd/ppp/ppp_ipcp.c
index 2da67805..c8348730 100644
--- a/accel-pptpd/ppp/ppp_ipcp.c
+++ b/accel-pptpd/ppp/ppp_ipcp.c
@@ -1,10 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <linux/ppp_defs.h>
-#include <linux/if.h>
-#include <linux/if_ppp.h>
 #include <arpa/inet.h>
+#include "linux_ppp.h"
 
 #include "triton.h"
 
diff --git a/accel-pptpd/ppp/ppp_lcp.c b/accel-pptpd/ppp/ppp_lcp.c
index c57afedd..7a87766b 100644
--- a/accel-pptpd/ppp/ppp_lcp.c
+++ b/accel-pptpd/ppp/ppp_lcp.c
@@ -1,10 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <linux/ppp_defs.h>
-#include <linux/if.h>
-#include <linux/if_ppp.h>
 #include <arpa/inet.h>
+#include "linux_ppp.h"
 
 #include "triton.h"
 
diff --git a/accel-pptpd/radius/acct.c b/accel-pptpd/radius/acct.c
index f6127029..0c914cf0 100644
--- a/accel-pptpd/radius/acct.c
+++ b/accel-pptpd/radius/acct.c
@@ -5,8 +5,8 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
-#include <linux/if.h>
-#include <linux/if_ppp.h>
+#include "linux_ppp.h"
+
 #include <openssl/md5.h>
 
 #include "log.h"
-- 
cgit v1.2.3