Fixes PR130 (os::scandir invocation).

* src/vm/os.hpp (os::scandir): Invoke the system's scandir function via
a template helper.

diff --git a/src/vm/os.hpp b/src/vm/os.hpp
index 58afb59e8b357eff603c236a5e3e64f3d87b748f..10da1fe9023e7e5bf3fa0a3ce4203121be69a9b7 100644 (file)
--- a/src/vm/os.hpp
+++ b/src/vm/os.hpp
@@ -167,6 +167,10 @@ public:
        static void* mmap_anonymous(void *addr, size_t len, int prot, int flags);
        static void  print_backtrace();
        static int   processors_online();
+
+       // Template helper
+       template<class F1, class F2>
+       static int call_scandir(int (*scandir)(const char *, struct dirent ***, F1, F2), const char *dir, struct dirent ***namelist, int(*filter)(const struct dirent *), int(*compar)(const void *, const void *));
 };
 
 
@@ -504,25 +508,16 @@ inline static void *system_realloc(void *ptr, size_t size)
 #endif
 }
 
+template<class F1, class F2>
+inline int os::call_scandir(int (*scandir)(const char *, struct dirent ***, F1, F2), const char *dir, struct dirent ***namelist, int(*filter)(const struct dirent *), int(*compar)(const void *, const void *))
+{
+       return scandir(dir, namelist, (F1) filter, (F2) compar);
+}
+
 inline int os::scandir(const char *dir, struct dirent ***namelist, int(*filter)(const struct dirent *), int(*compar)(const void *, const void *))
-/*
-#elif defined(__SOLARIS__)
-inline int os::scandir(const char *dir, struct dirent ***namelist, int(*filter)(const struct dirent *), int(*compar)(const struct dirent **, const struct dirent **))
-#elif defined(__IRIX__)
-inline int os::scandir(const char *dir, struct dirent ***namelist, int(*filter)(dirent_t *), int(*compar)(dirent_t **, dirent_t **))
-#else
-inline int os::scandir(const char *dir, struct dirent ***namelist, int(*filter)(struct dirent *), int(*compar)(const void *, const void *))
-#endif
-*/
 {
 #if defined(HAVE_SCANDIR)
-# if defined(__LINUX__)
-       return ::scandir(dir, namelist, filter, compar);
-#elif defined(__SOLARIS__)
-       return ::scandir(dir, namelist, filter, (int (*)(const dirent**, const dirent**)) compar);
-# else
-       return ::scandir(dir, namelist, (int (*)(struct dirent*)) filter, compar);
-# endif
+       return call_scandir(::scandir, dir, namelist, filter, compar);
 #else
 # error scandir not available
 #endif