[vlc-devel] [PATCH 2/4] src: use vlc_search.h instead of search.h

[Steve Lhomme]

---
 src/misc/actions.c   | 4 +---
 src/misc/objects.c   | 5 +----
 src/misc/threads.c   | 4 +---
 src/misc/variables.c | 4 +---
 src/modules/bank.c   | 4 +---
 src/modules/entry.c  | 4 +---
 6 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/misc/actions.c b/src/misc/actions.c
index b6e76e75d9..75d4627da7 100644
--- a/src/misc/actions.c
+++ b/src/misc/actions.c
@@ -32,9 +32,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <limits.h>
-#ifdef HAVE_SEARCH_H
-# include <search.h>
-#endif
+#include <vlc_search.h>
 #include <errno.h>
 
 #include <vlc_common.h>
diff --git a/src/misc/objects.c b/src/misc/objects.c
index f87edd9827..c40e69e3ed 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -45,13 +45,10 @@
 
 #include "vlc_interface.h"
 #include "vlc_codec.h"
+#include "vlc_search.h"
 
 #include "variables.h"
 
-#ifdef HAVE_SEARCH_H
-# include <search.h>
-#endif
-
 #include <limits.h>
 #include <assert.h>
 
diff --git a/src/misc/threads.c b/src/misc/threads.c
index 54643ba4aa..746b6bf4b1 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -53,9 +53,7 @@ void vlc_global_mutex (unsigned n, bool acquire)
 }
 
 #ifndef NDEBUG
-# ifdef HAVE_SEARCH_H
-#  include <search.h>
-# endif
+#include <vlc_search.h>
 
 struct vlc_lock_mark
 {
diff --git a/src/misc/variables.c b/src/misc/variables.c
index a39fd4143f..57726f34f0 100644
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -27,15 +27,13 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_SEARCH_H
-# include <search.h>
-#endif
 #include <assert.h>
 #include <float.h>
 #include <math.h>
 #include <limits.h>
 
 #include <vlc_common.h>
+#include <vlc_search.h>
 #include <vlc_arrays.h>
 #include <vlc_charset.h>
 #include "libvlc.h"
diff --git a/src/modules/bank.c b/src/modules/bank.c
index 0b551a91bc..e0c76c3e10 100644
--- a/src/modules/bank.c
+++ b/src/modules/bank.c
@@ -36,11 +36,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#ifdef HAVE_SEARCH_H
-# include <search.h>
-#endif
 
 #include <vlc_common.h>
+#include <vlc_search.h>
 #include <vlc_plugin.h>
 #include <vlc_modules.h>
 #include <vlc_fs.h>
diff --git a/src/modules/entry.c b/src/modules/entry.c
index bce94285c6..5a42be72d4 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -29,9 +29,7 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <float.h>
-#ifdef HAVE_SEARCH_H
-# include <search.h>
-#endif
+#include <vlc_search.h>
 
 #include "modules/modules.h"
 #include "config/configuration.h"
-- 
2.17.1