diff options
| author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2009-07-03 18:32:31 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel.holtmann@intel.com> | 2009-07-03 08:47:26 -0700 |
| commit | 073261e5072685528e51bbbd991b6e23470be30c (patch) | |
| tree | 4e0d6a6948e1145c7b0291279a196022543722cc | |
| parent | e34e16b341a00ba383a93fdbb018ce39d5519cad (diff) | |
| download | ofono-073261e5072685528e51bbbd991b6e23470be30c.tar.bz2 | |
Use phonet.h
| -rw-r--r-- | gisi/Makefile.am | 1 | ||||
| -rw-r--r-- | gisi/client.c | 6 | ||||
| -rw-r--r-- | gisi/netlink.c | 5 | ||||
| -rw-r--r-- | gisi/socket.c | 7 |
4 files changed, 4 insertions, 15 deletions
diff --git a/gisi/Makefile.am b/gisi/Makefile.am index 10b325c8..e999b89a 100644 --- 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 ae8b0307..b12dc852 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 d5555883..837f98e5 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 6f72120e..3eef09c2 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) |