Remove utility.h and alignof workarounds

GHCs older than 8.6 (`base` less than 4.12) are not supported anymore.
Rufflewind · Jul 5, 2024 · b9b2cda · b9b2cda
1 parent 73cea1f
commit b9b2cda
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/System/Directory/Internal/C_utimensat.hsc b/System/Directory/Internal/C_utimensat.hsc
@@ -12,7 +12,6 @@ module System.Directory.Internal.C_utimensat where
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#include <System/Directory/Internal/utility.h>
 import Prelude ()
 import System.Directory.Internal.Prelude
 import Data.Time.Clock.POSIX (POSIXTime)
@@ -21,8 +20,7 @@ data CTimeSpec = CTimeSpec EpochTime CLong
 
 instance Storable CTimeSpec where
     sizeOf    _ = #{size struct timespec}
-    -- workaround (hsc2hs for GHC < 8.0 doesn't support #{alignment ...})
-    alignment _ = #{size char[alignof(struct timespec)] }
+    alignment _ = #{alignment struct timespec}
     poke p (CTimeSpec sec nsec) = do
       (#poke struct timespec, tv_sec)  p sec
       (#poke struct timespec, tv_nsec) p nsec

diff --git a/System/Directory/Internal/Windows.hsc b/System/Directory/Internal/Windows.hsc
@@ -12,7 +12,6 @@ module System.Directory.Internal.Windows where
 #include <shlobj.h>
 #include <windows.h>
 #include <HsBaseConfig.h>
-#include <System/Directory/Internal/utility.h>
 #include <System/Directory/Internal/windows_ext.h>
 import Prelude ()
 import System.Directory.Internal.Prelude
@@ -177,8 +176,7 @@ win32_alloca_REPARSE_DATA_BUFFER action =
   allocaBytesAligned size align $ \ ptr ->
     action (ptr, size)
   where size = fromIntegral win32_mAXIMUM_REPARSE_DATA_BUFFER_SIZE
-        -- workaround (hsc2hs for GHC < 8.0 don't support #{alignment ...})
-        align = #{size char[alignof(HsDirectory_REPARSE_DATA_BUFFER)]}
+        align = #{alignment HsDirectory_REPARSE_DATA_BUFFER}
 
 win32_peek_REPARSE_DATA_BUFFER
   :: Ptr Win32_REPARSE_DATA_BUFFER -> IO Win32_REPARSE_DATA_BUFFER

diff --git a/System/Directory/Internal/utility.h b/System/Directory/Internal/utility.h