[project @ 2005-10-10 23:32:51 by sof]

[haskell-directory.git] / System / Posix / Types.hs

diff --git a/System/Posix/Types.hs b/System/Posix/Types.hs
index 77ec354..7ade7bf 100644 (file)
--- a/System/Posix/Types.hs
+++ b/System/Posix/Types.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -fno-implicit-prelude #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Posix.Types
@@ -14,7 +14,7 @@
 --
 -----------------------------------------------------------------------------
 
-#include "config.h"
+#include "HsBaseConfig.h"
 
 module System.Posix.Types (
 
@@ -34,7 +34,7 @@ module System.Posix.Types (
 #if defined(HTYPE_PID_T)
   CPid,
 #endif
-#if defined(HTYPE_SIZE_T) || defined(HTYPE_SSIZE_T)
+#if defined(HTYPE_SSIZE_T)
   CSsize,
 #endif
 
@@ -101,11 +101,10 @@ import GHC.Show
 import Control.Monad
 #endif
 
-#include "Typeable.h"
 #include "CTypes.h"
 
 #if defined(HTYPE_DEV_T)
-NUMERIC_TYPE(CDev,tyConCDev,"CDev",HTYPE_DEV_T)
+ARITHMETIC_TYPE(CDev,tyConCDev,"CDev",HTYPE_DEV_T)
 #endif
 #if defined(HTYPE_INO_T)
 INTEGRAL_TYPE(CIno,tyConCIno,"CIno",HTYPE_INO_T)
@@ -120,11 +119,7 @@ INTEGRAL_TYPE(COff,tyConCOff,"COff",HTYPE_OFF_T)
 INTEGRAL_TYPE(CPid,tyConCPid,"CPid",HTYPE_PID_T)
 #endif
 
-#if defined(HTYPE_SIZE_T)
-INTEGRAL_TYPE(CSsize,tyConCSsize,"CSsize",HTYPE_SIZE_T)
-#endif
-
-#if defined(HTYPE_SSIZE_T) && !defined(HTYPE_SIZE_T)
+#if defined(HTYPE_SSIZE_T)
 INTEGRAL_TYPE(CSsize,tyConCSsize,"CSsize",HTYPE_SSIZE_T)
 #endif
 
@@ -139,10 +134,10 @@ INTEGRAL_TYPE(CNlink,tyConCNlink,"CNlink",HTYPE_NLINK_T)
 INTEGRAL_TYPE(CUid,tyConCUid,"CUid",HTYPE_UID_T)
 #endif
 #if defined(HTYPE_CC_T)
-NUMERIC_TYPE(CCc,tyConCCc,"CCc",HTYPE_CC_T)
+ARITHMETIC_TYPE(CCc,tyConCCc,"CCc",HTYPE_CC_T)
 #endif
 #if defined(HTYPE_SPEED_T)
-NUMERIC_TYPE(CSpeed,tyConCSpeed,"CSpeed",HTYPE_SPEED_T)
+ARITHMETIC_TYPE(CSpeed,tyConCSpeed,"CSpeed",HTYPE_SPEED_T)
 #endif
 #if defined(HTYPE_TCFLAG_T)
 INTEGRAL_TYPE(CTcflag,tyConCTcflag,"CTcflag",HTYPE_TCFLAG_T)