[MPlayer-cvslog] r23799 - in trunk: configure osdep/Makefile osdep/scandir.c

[diego]

Author: diego
Date: Tue Jul 17 11:45:10 2007
New Revision: 23799

Log:
Remove unused scandir() check and fallback implementation.


Removed:
   trunk/osdep/scandir.c
Modified:
   trunk/configure
   trunk/osdep/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Tue Jul 17 11:45:10 2007
@@ -3323,22 +3323,6 @@ fi
 echores "$_shm"
 
 
-echocheck "scandir()"
-cat > $TMPC << EOF
-int main (void) { scandir("", 0, 0, 0); alphasort(0, 0); return 0; }
-EOF
-_scandir=no
-cc_check && _scandir=yes
-if test "$_scandir" = yes ; then
- _def_scandir='#define HAVE_SCANDIR 1'
- _need_scandir=no
-else
- _def_scandir='#undef HAVE_SCANDIR'
- _need_scandir=yes
-fi
-echores "$_scandir"
-
-
 echocheck "strsep()"
 cat > $TMPC << EOF
 #include <string.h>
@@ -7396,7 +7380,6 @@ HAVE_POSIX_SELECT = $_posix_select
 
 NEED_GETTIMEOFDAY    = $_need_gettimeofday
 NEED_GLOB    = $_need_glob
-NEED_SCANDIR = $_need_scandir
 NEED_SETENV  = $_need_setenv
 NEED_SHMEM   = $_need_shmem
 NEED_STRSEP  = $_need_strsep
@@ -7749,9 +7732,6 @@ $_def_zlib
 /* Define this if you have shm support */
 $_def_shm
 
-/* Define this if your system has scandir & alphasort */
-$_def_scandir
-
 /* Define this if your system has strsep */
 $_def_strsep
 

Modified: trunk/osdep/Makefile
==============================================================================
--- trunk/osdep/Makefile	(original)
+++ trunk/osdep/Makefile	Tue Jul 17 11:45:10 2007
@@ -7,7 +7,6 @@ SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += 
 
 SRCS_COMMON-$(NEED_GETTIMEOFDAY)     += gettimeofday.c
 SRCS_COMMON-$(NEED_GLOB)             += glob-win.c
-SRCS_COMMON-$(NEED_SCANDIR)          += scandir.c
 SRCS_COMMON-$(NEED_SETENV)           += setenv.c
 SRCS_COMMON-$(NEED_SHMEM)            += shmem.c
 SRCS_COMMON-$(NEED_STRSEP)           += strsep.c