[0/3] Phonet build work-arounds take two

[Rémi Denis-Courmont]

Simpler option for patch 3/3

-- 
Rémi Denis-Courmont
-------------- next part --------------
From cc159ea567bca758984d0e445d78a45d426fa62f Mon Sep 17 00:00:00 2001
From: =?utf-8?q?R=C3=A9mi=20Denis-Courmont?= <remi.denis-courmont at nokia.com>
Date: Fri, 3 Jul 2009 18:32:31 +0300
Subject: [PATCH 3/3] Use phonet.h

---
 gisi/client.c  |    6 +-----
 gisi/netlink.c |    5 +----
 gisi/socket.c  |    7 +------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/gisi/client.c b/gisi/client.c
index ae8b030..b12dc85 100644
--- a/gisi/client.c
+++ b/gisi/client.c
@@ -33,12 +33,8 @@
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <errno.h>
+#include "phonet.h"
 #include <glib.h>
-#include <linux/types.h>
-#include <linux/phonet.h>
-#ifndef AF_PHONET
-#define AF_PHONET 35
-#endif
 
 #include "socket.h"
 #include "client.h"
diff --git a/gisi/netlink.c b/gisi/netlink.c
index d555588..837f98e 100644
--- a/gisi/netlink.c
+++ b/gisi/netlink.c
@@ -36,11 +36,8 @@
 #ifndef SOL_NETLINK
 #define SOL_NETLINK 270 /* libc!? */
 #endif
-#ifndef AF_PHONET
-#define AF_PHONET 35
-#endif
+#include "phonet.h"
 #include <linux/rtnetlink.h>
-#include <linux/phonet.h>
 #include <glib.h>
 
 #include "netlink.h"
diff --git a/gisi/socket.c b/gisi/socket.c
index 6f72120..3eef09c 100644
--- a/gisi/socket.c
+++ b/gisi/socket.c
@@ -31,14 +31,9 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <linux/types.h>
-#include <linux/phonet.h>
+#include "phonet.h"
 #include <glib.h>
 
-#ifndef AF_PHONET
-#define AF_PHONET 35
-#define PF_PHONET AF_PHONET
-#endif
 #include "socket.h"
 
 GIOChannel *phonet_new(uint8_t resource)
-- 
1.6.0.4