[vlc-commits] Remove harmful HAVE_SEARCH_H

Rémi Denis-Courmont git at videolan.org
Wed May 23 20:33:33 CEST 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 23 20:53:35 2018 +0300| [eca2be7d7fb8a02f7a27f57bd49261eebd115dcb] | committer: Rémi Denis-Courmont

Remove harmful HAVE_SEARCH_H

This fixes building the keysym generator.
Regression from 3cea7a78999068f71972094e849f95c1591d3e3a.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eca2be7d7fb8a02f7a27f57bd49261eebd115dcb
---

 modules/services_discovery/pulse.c | 2 --
 modules/services_discovery/udev.c  | 2 --
 modules/video_output/xcb/keysym.c  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/modules/services_discovery/pulse.c b/modules/services_discovery/pulse.c
index 839fb6a6fd..03ad22561d 100644
--- a/modules/services_discovery/pulse.c
+++ b/modules/services_discovery/pulse.c
@@ -24,9 +24,7 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_SEARCH_H
 #include <search.h>
-#endif
 #include <assert.h>
 
 #include <vlc_common.h>
diff --git a/modules/services_discovery/udev.c b/modules/services_discovery/udev.c
index 65cf7e267b..d297f4708d 100644
--- a/modules/services_discovery/udev.c
+++ b/modules/services_discovery/udev.c
@@ -25,9 +25,7 @@
 #endif
 
 #include <errno.h>
-#ifdef HAVE_SEARCH_H
 #include <search.h>
-#endif
 #include <poll.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/modules/video_output/xcb/keysym.c b/modules/video_output/xcb/keysym.c
index f131013154..ad4e31c8a7 100644
--- a/modules/video_output/xcb/keysym.c
+++ b/modules/video_output/xcb/keysym.c
@@ -25,9 +25,7 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <limits.h>
-#ifdef HAVE_SEARCH_H
 #include <search.h>
-#endif
 #include <assert.h>
 
 struct keysym



More information about the vlc-commits mailing list