From 67f559ecc5833bb50a8d9a1f9a514eb7c2a4bd17 Mon Sep 17 00:00:00 2001
From: Angelo Mantellini <angelo.mantellini@cisco.com>
Date: Tue, 17 Mar 2020 20:23:22 +0100
Subject: [HICN-552] don't use hicn socket on apple OS

Signed-off-by: Angelo Mantellini <angelo.mantellini@cisco.com>
Change-Id: Ib555fb14d3240c85f5aa4eef065faad8f2ff9795
---
 hicn-light/src/hicn/core/forwarder.c      | 5 ++++-
 hicn-light/src/hicn/core/forwarder.h      | 6 ++++--
 hicn-light/src/hicn/socket/CMakeLists.txt | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'hicn-light/src')

diff --git a/hicn-light/src/hicn/core/forwarder.c b/hicn-light/src/hicn/core/forwarder.c
index 0d7575ea0..f7b0af2c2 100644
--- a/hicn-light/src/hicn/core/forwarder.c
+++ b/hicn-light/src/hicn/core/forwarder.c
@@ -103,9 +103,10 @@ struct forwarder {
 
   PARCClock *clock;
 
+#if !defined(__APPLE__)
   hicn_socket_helper_t
       *hicnSocketHelper;  // state required to manage hicn connections
-
+#endif
   // used by seed48 and nrand48
   unsigned short seed[3];
 
@@ -523,9 +524,11 @@ PARCClock *forwarder_GetClock(const Forwarder *forwarder) {
   return forwarder->clock;
 }
 
+#if !defined(__APPLE__)
 hicn_socket_helper_t *forwarder_GetHicnSocketHelper(Forwarder *forwarder) {
   return forwarder->hicnSocketHelper;
 }
+#endif
 
 // =======================================================
 
diff --git a/hicn-light/src/hicn/core/forwarder.h b/hicn-light/src/hicn/core/forwarder.h
index a2401d625..d1815b7d4 100644
--- a/hicn-light/src/hicn/core/forwarder.h
+++ b/hicn-light/src/hicn/core/forwarder.h
@@ -46,7 +46,9 @@
 
 #include <parc/algol/parc_Clock.h>
 
+#if !defined(__APPLE__)
 #include <hicn/socket/api.h>
+#endif
 
 #define PORT_NUMBER 9695
 #define PORT_NUMBER_AS_STRING "9695"
@@ -265,9 +267,9 @@ void forwarder_ClearCache(Forwarder *forwarder);
 void forwarder_SetStrategy(Forwarder *forwarder, Name *prefix,
                            strategy_type strategy, unsigned related_prefixes_len,
                            Name **related_prefixes);
-
+#if !defined(__APPLE__)
 hicn_socket_helper_t *forwarder_GetHicnSocketHelper(Forwarder *forwarder);
-
+#endif
 #ifdef WITH_MAPME
 
 /**
diff --git a/hicn-light/src/hicn/socket/CMakeLists.txt b/hicn-light/src/hicn/socket/CMakeLists.txt
index ce2a9caf4..775693bf0 100644
--- a/hicn-light/src/hicn/socket/CMakeLists.txt
+++ b/hicn-light/src/hicn/socket/CMakeLists.txt
@@ -34,4 +34,4 @@ set(TO_INSTALL_HEADER_FILES
 )
 
 set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE)
-set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)
\ No newline at end of file
+set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)
-- 
cgit 1.2.3-korg