| Description | Currently in olsrd, the macro used to represent Mac OS X is __MacOSX__. Apple's gcc automatically provides __APPLE__ and this is the standard macro for detecting Mac OS X. Using the standard, compiler-defined macros means that the C files will build properly independently of the build system, making creating new build systems much easier.
olsrd is already using standard, compiler-defined macros like __FreeBSD__, __OpenBSD__, __FreeBSD_kernel__, and __GNUC__.
This patch applies on today's HEAD of the stable branch. |
| Attached Files |  0001-use-__APPLE__-macro-defined-by-Apple-s-gcc-instead-o.patch [^] (7,351 bytes) 2012-04-05 20:09 [Show Content] [Hide Content]From 376ec91044f8ce17353da88827972f5cb89de943 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 31 Jan 2012 16:02:26 -0500
Subject: [PATCH 1/7] use __APPLE__ macro defined by Apple's gcc instead of __MacOSX__
---
lib/pgraph/src/olsrd_pgraph.c | 2 +-
make/Makefile.osx | 1 -
src/bsd/net.c | 8 ++++----
src/cfgparser/olsrd_conf.c | 2 +-
src/linux/net.c | 2 +-
src/main.c | 4 ++--
src/olsr_cfg.h | 2 +-
src/olsr_types.h | 2 +-
src/unix/ifnet.c | 4 ++--
9 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/lib/pgraph/src/olsrd_pgraph.c b/lib/pgraph/src/olsrd_pgraph.c
index fc6e8fa..59adcc9 100644
--- a/lib/pgraph/src/olsrd_pgraph.c
+++ b/lib/pgraph/src/olsrd_pgraph.c
@@ -384,7 +384,7 @@ ipc_send(const char *data, int size)
if (ipc_connection == -1)
return 0;
-#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __MacOSX__ || __OpenBSD__
+#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__ || __OpenBSD__
#define FLAG 0
#else
#define FLAG MSG_NOSIGNAL
diff --git a/make/Makefile.osx b/make/Makefile.osx
index 614a28c..945ff2d 100644
--- a/make/Makefile.osx
+++ b/make/Makefile.osx
@@ -12,7 +12,6 @@ LIBDIR = $(DESTDIR)/usr/lib
SRCS += $(wildcard src/bsd/*.c src/unix/*.c)
HDRS += $(wildcard src/bsd/*.h src/unix/*.h)
-CPPFLAGS += -D__MacOSX__
LIBS +=
PLUGIN_SONAME ?= $(PLUGIN_NAME)
diff --git a/src/bsd/net.c b/src/bsd/net.c
index b8dd68a..ef74c32 100644
--- a/src/bsd/net.c
+++ b/src/bsd/net.c
@@ -108,7 +108,7 @@
#endif
#endif
-#ifdef __MacOSX__
+#ifdef __APPLE__
#include <ifaddrs.h>
#include <net/if_var.h>
#include <net/ethernet.h>
@@ -135,7 +135,7 @@ static int
set_sysctl_int(const char *name, int new)
{
int old;
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__MacOSX__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__)
size_t len = sizeof(old);
#else
unsigned int len = sizeof(old);
@@ -197,7 +197,7 @@ net_os_set_global_ifoptions(void) {
name = "net.inet6.icmp6.rediraccept";
ignore_redir = set_sysctl_int(name, 0);
-#elif defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __MacOSX__
+#elif defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__
if (olsr_cnf->ip_version == AF_INET) {
name = "net.inet.icmp.drop_redirect";
ignore_redir = set_sysctl_int(name, 1);
@@ -250,7 +250,7 @@ net_os_restore_ifoptions(void) {
#ifdef __OpenBSD__
name = olsr_cnf->ip_version == AF_INET ? "net.inet.icmp.rediraccept" : "net.inet6.icmp6.rediraccept";
-#elif defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __MacOSX__
+#elif defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__
name = olsr_cnf->ip_version == AF_INET ? "net.inet.icmp.drop_redirect" : "net.inet6.icmp6.rediraccept";
#else
name = olsr_cnf->ip_version == AF_INET ? "net.inet.icmp.drop_redirect" : "net.inet6.icmp6.drop_redirect";
diff --git a/src/cfgparser/olsrd_conf.c b/src/cfgparser/olsrd_conf.c
index c305856..3f9650d 100644
--- a/src/cfgparser/olsrd_conf.c
+++ b/src/cfgparser/olsrd_conf.c
@@ -776,7 +776,7 @@ set_default_cnf(struct olsrd_config *cnf)
cnf->rtnl_s = 0;
#endif
-#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __MacOSX__ || defined __NetBSD__ || defined __OpenBSD__
+#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__ || defined __NetBSD__ || defined __OpenBSD__
cnf->rts = 0;
#endif
}
diff --git a/src/linux/net.c b/src/linux/net.c
index 30221b7..ae1b39a 100644
--- a/src/linux/net.c
+++ b/src/linux/net.c
@@ -609,7 +609,7 @@ join_mcast(struct interface *ifs, int sock)
mcastreq.ipv6mr_multiaddr = ifs->int6_multaddr.sin6_addr;
mcastreq.ipv6mr_interface = ifs->if_index;
-#if !defined __FreeBSD__ && !defined __FreeBSD_kernel__ && !defined __MacOSX__ && !defined __NetBSD__
+#if !defined __FreeBSD__ && !defined __FreeBSD_kernel__ && !defined __APPLE__ && !defined __NetBSD__
OLSR_PRINTF(3, "Interface %s joining multicast %s...", ifs->int_name, ip6_to_string(&buf, &ifs->int6_multaddr.sin6_addr));
/* Send multicast */
if (setsockopt(sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *)&mcastreq, sizeof(struct ipv6_mreq)) < 0) {
diff --git a/src/main.c b/src/main.c
index c2cce15..6688df5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -438,7 +438,7 @@ int main(int argc, char *argv[]) {
/*
* create routing socket
*/
-#if defined __FreeBSD__ || __FreeBSD_kernel__ || defined __MacOSX__ || defined __NetBSD__ || defined __OpenBSD__
+#if defined __FreeBSD__ || __FreeBSD_kernel__ || defined __APPLE__ || defined __NetBSD__ || defined __OpenBSD__
olsr_cnf->rts = socket(PF_ROUTE, SOCK_RAW, 0);
if (olsr_cnf->rts < 0) {
olsr_syslog(OLSR_LOG_ERR, "routing socket: %m");
@@ -810,7 +810,7 @@ static void olsr_shutdown(int signo __attribute__ ((unused)))
close (olsr_cnf->rt_monitor_socket);
#endif
-#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __MacOSX__ || defined __NetBSD__ || defined __OpenBSD__
+#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__ || defined __NetBSD__ || defined __OpenBSD__
/* routing socket */
close(olsr_cnf->rts);
#endif
diff --git a/src/olsr_cfg.h b/src/olsr_cfg.h
index 47752e3..ad391a3 100644
--- a/src/olsr_cfg.h
+++ b/src/olsr_cfg.h
@@ -287,7 +287,7 @@ struct olsrd_config {
int rt_monitor_socket;
#endif
-#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __MacOSX__ || defined __NetBSD__ || defined __OpenBSD__
+#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__ || defined __NetBSD__ || defined __OpenBSD__
int rts; /* Socket used for route changes on BSDs */
#endif
float lq_nat_thresh;
diff --git a/src/olsr_types.h b/src/olsr_types.h
index 917d471..4f4540f 100644
--- a/src/olsr_types.h
+++ b/src/olsr_types.h
@@ -47,7 +47,7 @@
#ifndef _OLSR_TYPES_H
#define _OLSR_TYPES_H
-#if !defined linux && !defined __MacOSX__ && !defined WIN32 && !defined __FreeBSD__ && !defined __FreeBSD_kernel__ && !defined __NetBSD__ && !defined __OpenBSD__
+#if !defined linux && !defined __APPLE__ && !defined WIN32 && !defined __FreeBSD__ && !defined __FreeBSD_kernel__ && !defined __NetBSD__ && !defined __OpenBSD__
# error "Unsupported system"
#endif
diff --git a/src/unix/ifnet.c b/src/unix/ifnet.c
index 586f691..ea2876a 100644
--- a/src/unix/ifnet.c
+++ b/src/unix/ifnet.c
@@ -39,7 +39,7 @@
*
*/
-#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __MacOSX__ || defined __NetBSD__ || defined __OpenBSD__
+#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__ || defined __NetBSD__ || defined __OpenBSD__
#define ifr_netmask ifr_addr
#endif
@@ -628,7 +628,7 @@ chk_if_up(struct olsr_if *iface, int debuglvl __attribute__ ((unused)))
ifs.int6_multaddr.sin6_port = htons(olsr_cnf->olsrport);
ifs.int6_multaddr.sin6_addr = iface->cnf->ipv6_multicast.v6;
-#ifdef __MacOSX__
+#ifdef __APPLE__
ifs.int6_multaddr.sin6_scope_id = 0;
#endif
--
1.7.4.1
|
Relationships 
Relationships 