[MPlayer-cvslog] r37621 - in trunk: libmpdemux/mf.c osdep/glob.h

[reimar]

Author: reimar
Date: Mon Feb  8 21:48:49 2016
New Revision: 37621

Log:
Move HAVE_GLOB check into osdep.

Modified:
   trunk/libmpdemux/mf.c
   trunk/osdep/glob.h

Modified: trunk/libmpdemux/mf.c
==============================================================================
--- trunk/libmpdemux/mf.c	Mon Feb  8 21:43:50 2016	(r37620)
+++ trunk/libmpdemux/mf.c	Mon Feb  8 21:48:49 2016	(r37621)
@@ -31,11 +31,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_GLOB
-#include <glob.h>
-#else
 #include "osdep/glob.h"
-#endif
 #include "osdep/strsep.h"
 
 #include "mp_msg.h"

Modified: trunk/osdep/glob.h
==============================================================================
--- trunk/osdep/glob.h	Mon Feb  8 21:43:50 2016	(r37620)
+++ trunk/osdep/glob.h	Mon Feb  8 21:48:49 2016	(r37621)
@@ -19,9 +19,14 @@
 #ifndef MPLAYER_GLOB_H
 #define MPLAYER_GLOB_H
 
-#include <sys/types.h>
 #include "config.h"
 
+#ifdef HAVE_GLOB
+#include <glob.h>
+#else
+
+#include <sys/types.h>
+
 typedef struct {
   size_t gl_pathc;
   char **gl_pathv;
@@ -32,4 +37,6 @@ void globfree(glob_t *pglob);
 
 int  glob(const char *pattern, int flags, int (*errfunc)(const char *epath, int eerrno), glob_t *pglob);
 
+#endif
+
 #endif /* MPLAYER_GLOB_H */