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

[Steve Lhomme]

---
 modules/access/dtv/access.c           | 4 +---
 modules/services_discovery/pulse.c    | 2 +-
 modules/services_discovery/udev.c     | 2 +-
 modules/services_discovery/xcb_apps.c | 6 ++----
 modules/video_output/xcb/keysym.c     | 4 ++--
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index 55a320ceb9..4568335089 100644
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -28,9 +28,7 @@
 #include <vlc_access.h>
 #include <vlc_plugin.h>
 #include <vlc_dialog.h>
-#ifdef HAVE_SEARCH_H
-#include <search.h>
-#endif
+#include <vlc_search.h>
 
 #include "dtv.h"
 
diff --git a/modules/services_discovery/pulse.c b/modules/services_discovery/pulse.c
index 03ad22561d..a7b433fb14 100644
--- a/modules/services_discovery/pulse.c
+++ b/modules/services_discovery/pulse.c
@@ -24,7 +24,7 @@
 # include <config.h>
 #endif
 
-#include <search.h>
+#include <vlc_search.h>
 #include <assert.h>
 
 #include <vlc_common.h>
diff --git a/modules/services_discovery/udev.c b/modules/services_discovery/udev.c
index 752b5d2cbc..fff4aa27f0 100644
--- a/modules/services_discovery/udev.c
+++ b/modules/services_discovery/udev.c
@@ -25,7 +25,6 @@
 #endif
 
 #include <errno.h>
-#include <search.h>
 #include <poll.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -33,6 +32,7 @@
 #include <libudev.h>
 
 #include <vlc_common.h>
+#include <vlc_search.h>
 #include <vlc_services_discovery.h>
 #include <vlc_plugin.h>
 #ifdef HAVE_ALSA
diff --git a/modules/services_discovery/xcb_apps.c b/modules/services_discovery/xcb_apps.c
index 6c44797e2a..c9ac6e9c1b 100644
--- a/modules/services_discovery/xcb_apps.c
+++ b/modules/services_discovery/xcb_apps.c
@@ -32,9 +32,7 @@ typedef xcb_atom_t Atom;
 #include <vlc_dialog.h>
 #include <vlc_charset.h>
 #include <vlc_plugin.h>
-#ifdef HAVE_SEARCH_H
-# include <search.h>
-#endif
+#include <vlc_search.h>
 #include <poll.h>
 
 static int  Open (vlc_object_t *);
@@ -306,7 +304,7 @@ static int cmpapp (const void *a, const void *b)
     if (wa < wb)
         return -1;
     return 0;
-} 
+}
 
 static void UpdateApps (services_discovery_t *sd)
 {
diff --git a/modules/video_output/xcb/keysym.c b/modules/video_output/xcb/keysym.c
index 7333bd9005..31023924de 100644
--- a/modules/video_output/xcb/keysym.c
+++ b/modules/video_output/xcb/keysym.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <search.h>
+#include <vlc_search.h>
 #include <assert.h>
 
 struct keysym
@@ -62,7 +62,7 @@ static void printkey (const void *node, const VISIT which, const int depth)
 #endif
     printf ("/* XK_%-20s: %s*/\n", sym->xname, sym->uname);
     printf ("{ 0x%08"PRIx32", 0x%04"PRIx32" },\n", sym->xsym, sym->usym);
-        
+
     (void) depth;
 }
 
-- 
2.17.1