From d4df0a10657b9a2cda13641c85b7ab9df5daf3d7 Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Tue, 24 Dec 2013 19:20:27 +0100 Subject: [PATCH 1/2] make _ifconfig_get_ioctl field conditional for linux --- xorp/fea/data_plane/managers/fea_data_plane_manager_linux.hh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xorp/fea/data_plane/managers/fea_data_plane_manager_linux.hh b/xorp/fea/data_plane/managers/fea_data_plane_manager_linux.hh index 8e3fcff51..9914d4033 100644 --- a/xorp/fea/data_plane/managers/fea_data_plane_manager_linux.hh +++ b/xorp/fea/data_plane/managers/fea_data_plane_manager_linux.hh @@ -121,7 +121,9 @@ public: #endif private: +#if defined(HAVE_PROC_LINUX) && defined(HAVE_IOCTL_SIOCGIFCONF) IfConfigGetIoctl* _ifconfig_get_ioctl; +#endif }; #endif // __FEA_DATA_PLANE_MANAGERS_FEA_DATA_PLANE_MANAGER_LINUX_HH__ From 1a6c58404799064c26139e57aafca17ccafef8ba Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Tue, 24 Dec 2013 19:22:19 +0100 Subject: [PATCH 2/2] conditional _ifconfig_get_ioctl field init --- .../fea/data_plane/managers/fea_data_plane_manager_linux.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xorp/fea/data_plane/managers/fea_data_plane_manager_linux.cc b/xorp/fea/data_plane/managers/fea_data_plane_manager_linux.cc index ff4ec84f1..aac667073 100644 --- a/xorp/fea/data_plane/managers/fea_data_plane_manager_linux.cc +++ b/xorp/fea/data_plane/managers/fea_data_plane_manager_linux.cc @@ -71,8 +71,10 @@ extern "C" void destroy(FeaDataPlaneManager* fea_data_plane_manager) FeaDataPlaneManagerLinux::FeaDataPlaneManagerLinux(FeaNode& fea_node) - : FeaDataPlaneManager(fea_node, "Linux"), - _ifconfig_get_ioctl(NULL) + : FeaDataPlaneManager(fea_node, "Linux") +#if defined(HAVE_PROC_LINUX) && defined(HAVE_IOCTL_SIOCGIFCONF) + ,_ifconfig_get_ioctl(NULL) +#endif { }