Use phonet.h

diff --git a/gisi/Makefile.am b/gisi/Makefile.am
index 10b325c..e999b89 100644 (file)
--- a/gisi/Makefile.am
+++ b/gisi/Makefile.am
@@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libgisi.la
 MAINTAINERCLEANFILES = Makefile.in
 
 libgisi_la_SOURCES = \
+       phonet.h \
        netlink.h netlink.c \
        socket.h socket.c \
        client.h client.c

diff --git a/gisi/client.c b/gisi/client.c
index ae8b030..b12dc85 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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)