Fix incorrect source include of ifaddrs.c and stylistic changes (sctp…

…lab#404)
dasteihn · Jan 14, 2020 · f668bb6 · f668bb6
1 parent 32020d6
commit f668bb6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/meson.build b/meson.build
@@ -56,7 +56,7 @@ add_project_arguments([
 
 # OS-specific settings
 system = host_machine.system()
-if ['linux', 'android'].contains(system)
+if system in ['linux', 'android']
     add_project_arguments([
         '-D__Userspace_os_Linux',
         '-D_GNU_SOURCE',
@@ -68,7 +68,7 @@ elif system == 'freebsd'
     ] + compiler.get_supported_arguments([
         '-Wno-address-of-packed-member',
     ]), language: 'c')
-elif ['darwin', 'ios'].contains(system)
+elif system in ['darwin', 'ios']
     add_project_arguments([
             '-D__Userspace_os_Darwin',
             '-D__APPLE_USE_RFC_2292',

diff --git a/usrsctplib/meson.build b/usrsctplib/meson.build
@@ -12,9 +12,6 @@ sources = files([
     'user_recv_thread.c',
     'user_socket.c',
 ])
-if system == 'android'
-    sources += files('ifaddrs.c')
-endif
 
 subdir('netinet')
 subdir('netinet6')