[Playerstage-commit] code/stage/replace replace.h,1.2,1.3

[Richard V. <rt...@us...>]

Update of /cvsroot/playerstage/code/stage/replace
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26605/replace

Modified Files:
	replace.h 
Log Message:
merge done

Index: replace.h
===================================================================
RCS file: /cvsroot/playerstage/code/stage/replace/replace.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** replace.h	8 Feb 2005 15:37:21 -0000	1.2
--- replace.h	15 Jan 2008 01:25:42 -0000	1.3
***************
*** 77,87 ****
  #endif // !HAVE_POLL
  
! #if !HAVE_SCANDIR
! #include <sys/types.h>
! #include <dirent.h>
! int scandir(const char *dir, struct dirent ***namelist,
!             int (*select)(const struct dirent *),
!             int (*compar)(const struct dirent **, const struct dirent **));
! #endif //!HAVE_SCANDIR
  
  #if !HAVE_DIRNAME
--- 77,87 ----
  #endif // !HAVE_POLL
  
!   //#if !HAVE_SCANDIR
!   //#include <sys/types.h>
!   //#include <dirent.h>
!   //int scandir(const char *dir, struct dirent ***namelist,
!   //        int (*select)(const struct dirent *),
!   //        int (*compar)(const struct dirent **, const struct dirent **));
!   //#endif //!HAVE_SCANDIR
  
  #if !HAVE_DIRNAME