libpcap: fix 32bit build, try 2

This commit is contained in:
Adrien Destugues
2020-06-10 21:40:42 +02:00
parent 29298d2545
commit fe1bcb5152

View File

@@ -1,4 +1,4 @@
From e14a0062b596f09bb98f18fe55a7b51add633d62 Mon Sep 17 00:00:00 2001
From a7ead691803de7e0f099aeda9ca7e2be437ea8ff Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 28 Apr 2015 18:39:03 +0000
Subject: Haiku patch
@@ -377,16 +377,30 @@ index 0000000..983a7dc
+ return pcap_findalldevs_interfaces(_allDevices, errorBuffer, canBeBound);
+}
--
2.19.1
2.26.0
From 498332fb124c8041297e7d1055bc2330197b627a Mon Sep 17 00:00:00 2001
From 96ccd9be2fd19e5dc644463cbd81940cfa0b1612 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 26 Feb 2019 20:07:07 +0100
Subject: libpcap: fix 32bit x86 build
Confusion around the definition of int32...
diff --git a/bpf/net/bpf_filter.c b/bpf/net/bpf_filter.c
index 01a1b64..3503839 100644
--- a/bpf/net/bpf_filter.c
+++ b/bpf/net/bpf_filter.c
@@ -81,7 +81,9 @@
#include <stdlib.h>
#endif
+#ifndef __HAIKU__
#define int32 bpf_int32
+#endif
#define u_int32 bpf_u_int32
#ifndef LBL_ALIGN
diff --git a/pcap/bpf.h b/pcap/bpf.h
index 78ad890..fc05d7c 100644
--- a/pcap/bpf.h
@@ -401,5 +415,5 @@ index 78ad890..fc05d7c 100644
typedef unsigned long bpf_u_int32;
#else
--
2.19.1
2.26.0