Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-17 16:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Make tpacket_req3 definition conditional

Browse source 
The makefile includes need to be moved for everything to be
defined properly when the configure tests run.

The Ubuntu 12.04 x86_64 GCC and Linaro's 13.08 and newer AArch64
GCC's have the if_packet.h kernel header, but as of 13.12,
the Linaro AArch32 GCC does not.

Change-Id: I363c43fdb81b028f99aac77e15bff9462c87af4b

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Christopher Covington 2014-02-07 12:04:35 -05:00 • committed by Pavel Emelyanov
parent 35763e0b50
commit b0549064c1
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -19,9 +19,6 @@ export VERSION_SO_MAJOR VERSION_SO_MINOR
#
#MAKEFLAGS := -r -R
include Makefile.inc
include Makefile.config
#
# Common definitions
#
@ -114,6 +111,8 @@ export CC MAKE CFLAGS LIBS ARCH DEFINES MAKEFLAGS CRIU-SO
export SRC_DIR SYSCALL-LIB SH RM ARCH_DIR OBJCOPY LDARCH LD
export cflags-y
include Makefile.inc
include Makefile.config
include scripts/Makefile.version
include scripts/Makefile.rules

2
include/sk-packet.h
View file

@ -22,7 +22,9 @@ extern int packet_receive_one(struct nlmsghdr *h, void *arg);
#ifndef PACKET_FANOUT
#define PACKET_FANOUT 18
#endif
#ifndef TPACKET3_HDRLEN
struct tpacket_req3 {
unsigned int tp_block_size;
unsigned int tp_block_nr;