diff options
| author | OBATA Akio <obache@wizdas.com> | 2020-05-16 19:02:00 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-05-28 19:33:51 +0200 |
| commit | b4bc817183306c46d4edbdc4f05a616e1946db32 (patch) | |
| tree | 56974c2ef811462d93ac13b15b0e78737123038b | |
| parent | 223051e503d04855d6841941db2fd2f92c264af7 (diff) | |
| download | tdebase-b4bc817183306c46d4edbdc4f05a616e1946db32.tar.gz tdebase-b4bc817183306c46d4edbdc4f05a616e1946db32.zip | |
Check ifw_hwaddr member for struct ifreq
It is used for ioctl(SIOCGIFHWADDR) return storage member, but does not
exist on Solaris, it uses ifr_addr.
Signed-off-by: OBATA Akio <obache@wizdas.com>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 5bcd375ab51d0cf08e8263ba5f840c2daf53d161)
| -rw-r--r-- | config.h.cmake | 6 | ||||
| -rw-r--r-- | kcontrol/ConfigureChecks.cmake | 5 |
2 files changed, 11 insertions, 0 deletions
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 ) |