From b4bc817183306c46d4edbdc4f05a616e1946db32 Mon Sep 17 00:00:00 2001 From: OBATA Akio Date: Sat, 16 May 2020 19:02:00 +0900 Subject: Check ifw_hwaddr member for struct ifreq MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is used for ioctl(SIOCGIFHWADDR) return storage member, but does not exist on Solaris, it uses ifr_addr. Signed-off-by: OBATA Akio Signed-off-by: Slávek Banko (cherry picked from commit 5bcd375ab51d0cf08e8263ba5f840c2daf53d161) --- config.h.cmake | 6 ++++++ kcontrol/ConfigureChecks.cmake | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/config.h.cmake b/config.h.cmake index b2ed37797..4a37ca8d8 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -102,6 +102,12 @@ // taskmanager #cmakedefine HAVE_XCOMPOSITE +// kcontrol/nics +#cmakedefine HAVE_IFREQ_IFR_HWADDR +#ifndef HAVE_IFREQ_IFR_HWADDR +#define ifr_hwaddr ifr_addr +#endif + // kcontrol/fonts #cmakedefine HAVE_FONTCONFIG 1 #cmakedefine HAVE_FREETYPE2 1 diff --git a/kcontrol/ConfigureChecks.cmake b/kcontrol/ConfigureChecks.cmake index 3f017390c..157bb77ea 100644 --- a/kcontrol/ConfigureChecks.cmake +++ b/kcontrol/ConfigureChecks.cmake @@ -75,3 +75,8 @@ endif( ) # if( FONTENC_FOUND ) # set( HAVE_FONT_ENC 1 CACHE INTERNAL "" FORCE ) # endif( ) + + +##### check for ioctl(SIOCGIFHWADDR) return member + +check_struct_has_member( "struct ifreq" ifr_hwaddr net/if.h HAVE_IFREQ_IFR_HWADDR ) -- cgit v1.2.3