From 8437d20dc841bac881a24ba88a32885bb4901123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Taylor=20Ienczak=20Zanette?=
 <jpaulotiz@gmail.com>
Date: Wed, 22 Apr 2020 14:26:07 -0300
Subject: [PATCH] windows: Use correct pcre header, fix missing evil_unposix
 declaration

---
 header_checks/meson.build        |  2 +-
 src/lib/evil/meson.build         | 12 +++++++-----
 src/lib/evil/pcre/regex.h        |  8 ++++----
 src/lib/evil/unposix/meson.build |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/header_checks/meson.build b/header_checks/meson.build
index c153016af1..ed66b80b4d 100644
--- a/header_checks/meson.build
+++ b/header_checks/meson.build
@@ -226,7 +226,7 @@ if sys_windows == true
   zlib_dep = zlib_project.get_variable('zlib_dep')
   zlib_include_dir = zlib_project.get_variable('incdir')
 else
-  zlib = dependency('zlib')
+  zlib_dep = dependency('zlib')
   if not cc.has_header_symbol('regex.h', 'regcomp')
     error('regcomp can not be found')
   endif
diff --git a/src/lib/evil/meson.build b/src/lib/evil/meson.build
index aa68150455..8a650a67d5 100644
--- a/src/lib/evil/meson.build
+++ b/src/lib/evil/meson.build
@@ -1,7 +1,6 @@
-evil_deps = []
-evil_pub_deps = []
-
 if target_machine.system() == 'windows'
+  subdir('unposix')
+
   evil_src = [
     'evil_dlfcn.c',
     'evil_fcntl.c',
@@ -25,8 +24,11 @@ if target_machine.system() == 'windows'
   secur32 = cc.find_library('secur32')
   uuid = cc.find_library('uuid')
 
+  evil_deps = [psapi, ole32, ws2_32, secur32, uuid, pcre_dep, evil_unposix]
+  evil_pub_deps = [psapi, ole32, ws2_32, secur32, uuid, pcre_dep, evil_unposix]
+
   evil_lib = library('evil', evil_src,
-    dependencies : [psapi, ole32, ws2_32, secur32, uuid, pcre_dep, evil_unposix],
+    dependencies : evil_deps,
     include_directories : [config_dir],
     install: true,
     version: meson.project_version(),
@@ -34,7 +36,7 @@ if target_machine.system() == 'windows'
 
   evil = declare_dependency(
     include_directories: [include_directories('.')],
-    dependencies : [psapi, ole32, ws2_32, secur32, uuid, pcre_dep, evil_unposix],
+    dependencies : evil_pub_deps,
     link_with: evil_lib,
   )
 else
diff --git a/src/lib/evil/pcre/regex.h b/src/lib/evil/pcre/regex.h
index f6c09237bd..d0f523d9d2 100644
--- a/src/lib/evil/pcre/regex.h
+++ b/src/lib/evil/pcre/regex.h
@@ -1,6 +1,6 @@
-#ifndef __EVIL_PCRE_REGEX_H__
-#define __EVIL_PCRE_REGEX_H__
+#ifndef EVIL_PCRE_REGEX_H
+#define EVIL_PCRE_REGEX_H
 
-#include <pcreposix.h>
+#include <pcre.h>
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/lib/evil/unposix/meson.build b/src/lib/evil/unposix/meson.build
index fb6eebbbd0..63d4122eb5 100644
--- a/src/lib/evil/unposix/meson.build
+++ b/src/lib/evil/unposix/meson.build
@@ -24,14 +24,14 @@ if sys_windows
   evil_unposix_lib = static_library('evil_unposix',
     evil_unposix_src,
     include_directories: [include_directories('.'), config_dir],
-    dependencies : [],
+    dependencies : [pcre_dep],
     install: true,
     version: meson.project_version(),
   )
 
   evil_unposix = declare_dependency(
     include_directories: [include_directories('.')],
-    dependencies: [],
+    dependencies: [pcre_dep],
     link_with: evil_unposix_lib,
   )