embox
34 строки · 1.5 Кб
1diff -aur libpcap-libpcap-1.10.1/portability.h ../build/extbld/third_party/lib/libpcap/libpcap-libpcap-1.10.1/portability.h
2--- libpcap-libpcap-1.10.1/portability.h 2021-06-09 22:12:02.000000000 +0300
3+++ ../build/extbld/third_party/lib/libpcap/libpcap-libpcap-1.10.1/portability.h 2021-09-09 14:19:30.041295339 +0300
4@@ -112,30 +112,6 @@
5extern int pcap_vasprintf(char **, const char *, va_list ap);
6#endif
7
8-/* For Solaris before 11. */
9-#ifndef timeradd
10-#define timeradd(a, b, result) \
11- do { \
12- (result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \
13- (result)->tv_usec = (a)->tv_usec + (b)->tv_usec; \
14- if ((result)->tv_usec >= 1000000) { \
15- ++(result)->tv_sec; \
16- (result)->tv_usec -= 1000000; \
17- } \
18- } while (0)
19-#endif /* timeradd */
20-#ifndef timersub
21-#define timersub(a, b, result) \
22- do { \
23- (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
24- (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
25- if ((result)->tv_usec < 0) { \
26- --(result)->tv_sec; \
27- (result)->tv_usec += 1000000; \
28- } \
29- } while (0)
30-#endif /* timersub */
31-
32#ifdef HAVE_STRTOK_R
33#define pcap_strtok_r strtok_r
34#else
35