chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket-util: introduce in_addr_union similar to sockaddr_union and make use of it...
[elogind.git]
/
src
/
shared
/
socket-util.h
diff --git
a/src/shared/socket-util.h
b/src/shared/socket-util.h
index f938f86200c55da82003c5809d08021530d8e2c9..d125fca83feea91526f85a7a68458876cbc31763 100644
(file)
--- a/
src/shared/socket-util.h
+++ b/
src/shared/socket-util.h
@@
-24,7
+24,6
@@
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/un.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/un.h>
-#include <net/if.h>
#include <asm/types.h>
#include <linux/netlink.h>
#include <linux/if_packet.h>
#include <asm/types.h>
#include <linux/netlink.h>
#include <linux/if_packet.h>
@@
-42,6
+41,11
@@
union sockaddr_union {
struct sockaddr_ll ll;
};
struct sockaddr_ll ll;
};
+union in_addr_union {
+ struct in_addr in;
+ struct in6_addr in6;
+};
+
typedef struct SocketAddress {
union sockaddr_union sockaddr;
typedef struct SocketAddress {
union sockaddr_union sockaddr;