From e980b1bc6fedd2e6bfbe6b7b99c466acc6281afe Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 18 Oct 2011 17:20:56 +0000
Subject: Fix kppp FTBFS under armel

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1259480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kppp/configure.in.in | 3 +++
 kppp/opener.cpp      | 5 +++++
 kppp/pppstats.cpp    | 8 +++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'kppp')

diff --git a/kppp/configure.in.in b/kppp/configure.in.in
index 867d5f07..720680c2 100644
--- a/kppp/configure.in.in
+++ b/kppp/configure.in.in
@@ -30,6 +30,9 @@ AC_TRY_LINK([
   #ifndef STREAMS 
 
     #if defined(linux)
+      #ifndef aligned_u64
+        #define aligned_u64 unsigned long long __attribute__((aligned(8)))
+      #endif
       #include <linux/if_ppp.h>
     #elif defined(__DragonFly__)
       #include <net/ppp/if_ppp.h>
diff --git a/kppp/opener.cpp b/kppp/opener.cpp
index 2d88ef88..0d46edd9 100644
--- a/kppp/opener.cpp
+++ b/kppp/opener.cpp
@@ -72,6 +72,11 @@ extern "C" int _Precvmsg(int, void*, int);
 #    include <net/ppp_layer/ppp_defs.h>
 #    include <net/if.h>
 #    include <net/ppp/if_ppp.h>
+#  elif defined HAVE_LINUX_IF_PPP_H
+#    ifndef aligned_u64
+#      define aligned_u64 unsigned long long __attribute__((aligned(8)))
+#    endif
+#    include <linux/if_ppp.h>
 #  endif
 #else
 #  include <net/ppp_defs.h>
diff --git a/kppp/pppstats.cpp b/kppp/pppstats.cpp
index d4b3007e..fb4d6428 100644
--- a/kppp/pppstats.cpp
+++ b/kppp/pppstats.cpp
@@ -71,7 +71,13 @@
  #endif
  #include <sys/socket.h>		/* *BSD, Linux, NeXT, Ultrix etc. */
  #ifndef HAVE_NET_IF_PPP_H
-  #if defined(__DragonFly__)
+  #ifdef HAVE_LINUX_IF_PPP_H
+   #include <linux/if.h>
+   #ifndef aligned_u64
+    #define aligned_u64 unsigned long long __attribute__((aligned(8)))
+   #endif
+   #include <linux/if_ppp.h>
+  #elif defined(__DragonFly__)
    #include <net/if.h>
    #include <net/ppp/if_ppp.h>
   #endif
-- 
cgit v1.2.1