windows: Stop wrong inclusion of unposix in subprojects

configure.bat

@@ -54,11 +54,6 @@ exit /B 0
     :: Windows terminal specific options
     set CFLAGS=-fansi-escape-codes -fcolor-diagnostics %CFLAGS%
 
-    :: ---------------------------------
-    :: Reimplementing libraries
-    set CFLAGS=-I%cd:\=/%/src/lib/evil %CFLAGS%
-    set CFLAGS=-I%cd:\=/%/src/lib/evil/unposix/ %CFLAGS%
-
 
     if defined VERBOSE (
         set CFLAGS=-v %CFLAGS%

header_checks/meson.build

@@ -227,13 +227,13 @@ if sys_windows == true
   zlib_include_dir = zlib_project.get_variable('incdir')
 else
   zlib = dependency('zlib')
-  if cc.has_header_symbol('regex.h', 'regcomp') == false
+  if not cc.has_header_symbol('regex.h', 'regcomp')
     error('regcomp can not be found')
   endif
-endif
 
-if cc.has_header_symbol('fnmatch.h', 'fnmatch') == false
-  error('fnmatch can not be found')
+  if not cc.has_header_symbol('fnmatch.h', 'fnmatch')
+    error('fnmatch can not be found')
+  endif
 endif
 
 config_h.set('VMAJ', version_major)

meson.build

@@ -87,6 +87,7 @@ foreach cf: dev_cflags_try
     dev_cflags += cf
   endif
 endforeach
+
 add_global_arguments(dev_cflags, language: 'c')
 add_global_arguments(dev_cflags, language: 'cpp')
 

src/generic/evas/meson.build

@@ -12,7 +12,7 @@ subdir('common')
 common = static_library('evas_loader_common',
     generic_src,
     include_directories : [config_dir, zlib_include_dir],
-    dependencies: [generic_deps, rt],
+    dependencies: [generic_deps, rt, evil_unposix],
 )
 
 bin_ext=''
@@ -32,7 +32,7 @@ foreach loader : generic_loaders
         generic_src,
         include_directories : config_dir + [include_directories('common')],
         link_with : common,
-        dependencies: [eina, generic_deps],
+        dependencies: [eina, generic_deps, evil_unposix],
         install_dir : join_paths(dir_lib, 'evas', 'utils'),
         install : true,
     )

src/lib/eina/meson.build

@@ -374,7 +374,7 @@ execinfo = cc.find_library('execinfo', required: false)
 
 eina_lib = library('eina', sources,
   include_directories : config_dir,
-  dependencies: [execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil],
+  dependencies: [execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil, evil_unposix],
   install: true,
   version : meson.project_version()
 )

src/lib/eo/meson.build

@@ -47,7 +47,7 @@ eo_lib = library('eo',
     eo_src, pub_eo_file_target,
     dependencies: [eina, valgrind, execinfo],
     install: true,
-    version : meson.project_version()
+    version : meson.project_version(),
 )
 
 eo_lib_dbg = library('eo_dbg',
@@ -55,7 +55,7 @@ eo_lib_dbg = library('eo_dbg',
     dependencies: [eina, valgrind, execinfo],
     install: true,
     c_args : '-DEO_DEBUG',
-    version : meson.project_version()
+    version : meson.project_version(),
 )
 
 eo = declare_dependency(

src/lib/evas/meson.build

@@ -221,7 +221,7 @@ if cpu_sse3 == true or cpu_neon == true and cpu_neon_intrinsics == false
       evas_include_directories +
       [vg_common_inc_dir],
     c_args: native_arch_opt_c_args,
-    dependencies: [eina, eo, ector, emile, evas_deps, m],
+    dependencies: [eina, eo, ector, emile, evas_deps, m, evil_unposix],
   )
   evas_link += [ evas_opt ]
 endif
@@ -292,7 +292,7 @@ endforeach
 evas_lib = library('evas',
     include_directories: evas_include_directories + [vg_common_inc_dir],
     sources : [evas_src, pub_eo_file_target, priv_eo_file_target],
-    dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list],
+    dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list, evil_unposix],
     link_with: evas_link,
     install: true,
     c_args : '-DPACKAGE_DATA_DIR="'+join_paths(dir_data, 'evas')+'"',
@@ -302,13 +302,13 @@ evas_lib = library('evas',
 evas = declare_dependency(
    link_with : [evas_lib],
    sources: pub_eo_file_target,
-   dependencies : [m] + evas_pub_deps + evas_deps,
+   dependencies : [m] + evas_pub_deps + evas_deps + [evil_unposix],
    include_directories: evas_include_directories + [vg_common_inc_dir] + [include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer'))],
 )
 
 evas_bin = declare_dependency(
    link_with : [evas_lib],
-   dependencies : [eina, ecore, ector, emile, lua],
+   dependencies : [eina, ecore, ector, emile, lua, evil_unposix],
    include_directories : evas_include_directories
 )
 

src/lib/evil/meson.build

@@ -27,7 +27,7 @@ if target_machine.system() == 'windows'
   uuid = cc.find_library('uuid')
 
   evil_lib = library('evil', evil_src,
-    dependencies : [psapi, ole32, ws2_32, secur32, uuid, pcre_dep],
+    dependencies : [psapi, ole32, ws2_32, secur32, uuid, pcre_dep, evil_unposix],
     include_directories : [config_dir],
     install: true,
     version: meson.project_version(),
@@ -35,7 +35,7 @@ if target_machine.system() == 'windows'
 
   evil = declare_dependency(
     include_directories: [include_directories('.')],
-    dependencies : [psapi, ole32, ws2_32, secur32, uuid, pcre_dep],
+    dependencies : [psapi, ole32, ws2_32, secur32, uuid, pcre_dep, evil_unposix],
     link_with: evil_lib,
   )
 else

src/lib/evil/unposix/meson.build

@@ -1,8 +1,6 @@
 dir_package_include = '.'
 
-if target_machine.system() == 'windows'
-  subdir('sys')
-
+if sys_windows
   evil_unposix_src = []
 
   evil_unposix_header_src = [
@@ -21,6 +19,7 @@ if target_machine.system() == 'windows'
     'unistd.h',
   ]
 
+  subdir('sys')
 
   evil_unposix_lib = static_library('evil_unposix',
     evil_unposix_src,
@@ -39,10 +38,8 @@ if target_machine.system() == 'windows'
   install_headers(evil_unposix_header_src,
     install_dir : dir_package_include,
   )
-
 else
   evil_unposix = declare_dependency()
-
 endif
 
 automatic_pkgfile = (sys_windows == false)

src/lib/evil/unposix/stdlib.h

@@ -3,7 +3,7 @@
 
 #include "unimplemented.h"
 
-#include <evil_stdlib.h>
+#include_next <stdlib.h>
 
 UNIMPLEMENTED inline int mkstemp(char* template)
 {

src/lib/evil/unposix/sys/meson.build

@@ -1,31 +1,11 @@
-if target_machine.system() == 'windows'
-
-  evil_unposix_sys_src = [
-    'time.c',
+if sys_windows
+  evil_unposix_src += [
+    'sys/time.c',
   ]
 
-  evil_unposix_sys_header_src = [
-    'time.h', 
-    'stat.h', 
-    'types.h'
+  evil_unposix_header_src += [
+    'sys/time.h',
+    'sys/stat.h',
+    'sys/types.h'
   ]
-
-  evil_unposix_sys_lib = library('evil_unposix_sys',
-    evil_unposix_sys_src,
-    version: meson.project_version(),
-    install: true,
-  )
-  
-  evil_unposix_sys = declare_dependency(
-    include_directories: [include_directories('.')],
-    dependencies: [],
-    link_with: evil_unposix_sys_lib,
-  )
-
-  install_headers(evil_unposix_sys_header_src,
-    install_dir : dir_package_include,
-  ) 
-
 endif
-
-automatic_pkgfile = (sys_windows == false)

src/lib/evil/unposix/sys/time.c

@@ -1,4 +1,4 @@
-#include<sys/time.h>
+#include <sys/time.h>
 
 int gettimeofday(struct timeval * tp, struct timezone * tzp)
 {

src/lib/evil/unposix/unistd.h

@@ -3,8 +3,6 @@
 
 #include "unimplemented.h"
 
-#include <evil_unistd.h>
-
 #define F_OK 0
 #define W_OK 2
 #define R_OK 4