proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 09:15:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: Remove APPLE #defines from build

Browse Source 
We cannot build on apple machines at all due
to our usage of some gcc extensions that will
probably never see the light of day again.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-11-04 08:30:31 +00:00
parent 315aa6cde4
commit 42ddcf71e5
7 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -1180,9 +1180,6 @@ m4_define([FRR_INCLUDES],
/* Required for MAXSIG */ /* Required for MAXSIG */
#include <signal.h> #include <signal.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifdef __APPLE__
# define __APPLE_USE_RFC_3542
#endif
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>

5
lib/event.c
View File

@ -55,11 +55,6 @@ static int event_timer_cmp(const struct event *a, const struct event *b)
DECLARE_HEAP(event_timer_list, struct event, timeritem, event_timer_cmp); DECLARE_HEAP(event_timer_list, struct event, timeritem, event_timer_cmp);
#if defined(__APPLE__)
#include <mach/mach.h>
#include <mach/mach_time.h>
#endif
#define AWAKEN(m) \ #define AWAKEN(m) \
do { \ do { \
const unsigned char wakebyte = 0x01; \ const unsigned char wakebyte = 0x01; \

2
lib/ntop.c
View File

@ -158,7 +158,7 @@ inet4:
return dst; return dst;
} }
#if !defined(INET_NTOP_NO_OVERRIDE) && !defined(__APPLE__) #if !defined(INET_NTOP_NO_OVERRIDE)
/* we want to override libc inet_ntop, but make sure it shows up in backtraces /* we want to override libc inet_ntop, but make sure it shows up in backtraces
* as frr_inet_ntop (to avoid confusion while debugging) * as frr_inet_ntop (to avoid confusion while debugging)
*/ */

13
lib/sockopt.c
View File

@ -10,13 +10,12 @@
#include "sockunion.h" #include "sockunion.h"
#include "lib_errors.h" #include "lib_errors.h"
#if (defined(__FreeBSD__) \ #if (defined(__FreeBSD__) && \
&& ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) \ ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || \
|| (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) \ (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || \
|| (defined(__NetBSD__) && defined(__NetBSD_Version__) \ (defined(__NetBSD__) && defined(__NetBSD_Version__) && \
&& __NetBSD_Version__ >= 106010000) \ __NetBSD_Version__ >= 106010000) || \
|| defined(__OpenBSD__) || defined(__APPLE__) \ defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun)
|| defined(__DragonFly__) || defined(__sun)
#define HAVE_BSD_STRUCT_IP_MREQ_HACK #define HAVE_BSD_STRUCT_IP_MREQ_HACK
#endif #endif

11
lib/zebra.h
View File

@ -76,10 +76,6 @@
#include <sys/sockio.h> #include <sys/sockio.h>
#endif /* HAVE_SYS_SOCKIO_H */ #endif /* HAVE_SYS_SOCKIO_H */
#ifdef __APPLE__
#define __APPLE_USE_RFC_3542
#endif
#ifndef HAVE_LIBCRYPT #ifndef HAVE_LIBCRYPT
#ifdef HAVE_LIBCRYPTO #ifdef HAVE_LIBCRYPTO
#include <openssl/des.h> #include <openssl/des.h>
@ -280,10 +276,9 @@ struct in_pktinfo {
* OpenBSD: network byte order, apart from older versions which are as per * OpenBSD: network byte order, apart from older versions which are as per
* *BSD * *BSD
*/ */
#if defined(__NetBSD__) \ #if defined(__NetBSD__) || \
|| (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) \ (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) || \
|| (defined(__OpenBSD__) && (OpenBSD < 200311)) \ (defined(__OpenBSD__) && (OpenBSD < 200311))
|| (defined(__APPLE__))
#define HAVE_IP_HDRINCL_BSD_ORDER #define HAVE_IP_HDRINCL_BSD_ORDER
#endif #endif

3
lib/zlog.c
View File

@ -32,9 +32,6 @@
#ifdef __DragonFly__ #ifdef __DragonFly__
#include <sys/lwp.h> #include <sys/lwp.h>
#endif #endif
#ifdef __APPLE__
#include <mach/mach_traps.h>
#endif
#ifdef HAVE_LIBUNWIND #ifdef HAVE_LIBUNWIND
#define UNW_LOCAL_ONLY #define UNW_LOCAL_ONLY

6
zebra/kernel_socket.c
View File

@ -48,11 +48,7 @@ extern struct zebra_privs_t zserv_privs;
* 0). We follow this practice without questioning it, but it is a * 0). We follow this practice without questioning it, but it is a
* bug if frr calls ROUNDUP with 0. * bug if frr calls ROUNDUP with 0.
*/ */
#ifdef __APPLE__ #define ROUNDUP_TYPE long
#define ROUNDUP_TYPE int
#else
#define ROUNDUP_TYPE long
#endif
/* /*
* Because of these varying conventions, the only sane approach is for * Because of these varying conventions, the only sane approach is for