forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

doc: fix the compile error of txtimestamp.c

Browse source 
Vinson reported:

  HOSTCC  Documentation/networking/timestamping/txtimestamp
Documentation/networking/timestamping/txtimestamp.c:64:8: error:
redefinition of ‘struct in6_pktinfo’
 struct in6_pktinfo {
        ^
In file included from /usr/include/arpa/inet.h:23:0,
                 from Documentation/networking/timestamping/txtimestamp.c:33:
/usr/include/netinet/in.h:456:8: note: originally defined here
 struct in6_pktinfo
        ^

After we sync with libc header, we don't need this ugly hack any more.

Reported-by: Vinson Lee <vlee@twopensource.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
WANG Cong 2015-01-06 15:45:32 -08:00 • committed by David S. Miller
commit cd91cc5bdd
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Documentation/networking/timestamping/txtimestamp.c
View file

@ -59,14 +59,6 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
/* ugly hack to work around netinet/in.h and linux/ipv6.h conflicts */
#ifndef in6_pktinfo
struct in6_pktinfo {
struct in6_addr ipi6_addr;
int ipi6_ifindex;
};
#endif
/* command line parameters */ /* command line parameters */
static int cfg_proto = SOCK_STREAM; static int cfg_proto = SOCK_STREAM;
static int cfg_ipproto = IPPROTO_TCP; static int cfg_ipproto = IPPROTO_TCP;