From: sof <unknown>
Date: Wed, 25 Aug 2004 18:42:47 +0000 (+0000)
Subject: [project @ 2004-08-25 18:42:47 by sof]
X-Git-Tag: nhc98-1-18-release~261
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=5895000092ad2850b4f4ea28cbd0a3a9cf01e466;p=haskell-directory.git

[project @ 2004-08-25 18:42:47 by sof]
__hscore_d_name(), __hscore_end_of_dir(): de-platformify and use
 feature #defines instead.

[Should anyone see compilation breakages stemming from HsBase.h as a result
 of this commit, remember to 'autoreconf' in FPTOOLS_TOP and re-make.]
---

diff --git a/include/HsBase.h b/include/HsBase.h
index 1bd3b66..61faaf8 100644
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -479,26 +479,20 @@ INLINE mode_t __hscore_S_IWUSR() { return S_IWUSR; }
 INLINE mode_t __hscore_S_IXUSR() { return S_IXUSR; }
 #endif
 
-#if !defined(_MSC_VER)
 INLINE HsAddr
 __hscore_d_name( struct dirent* d )
 {
-#if !defined(mingw32_TARGET_OS) && !defined(_MSC_VER)
+#if defined(STRUCT_DIRENT_FLAT_LAYOUT)
   return (HsAddr)(&d->d_name);
 #else
   return (HsAddr)(d->d_name);
 #endif
 }
-#endif
 
 INLINE HsInt
 __hscore_end_of_dir( void )
 {
-#ifndef mingw32_TARGET_OS
-  return 0;
-#else
-  return ENOENT;
-#endif
+  return READDIR_ERRNO_EOF;
 }
 
 INLINE void