X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=System%2FPosix%2FTypes.hs;h=f24fed150b9e86c16856aa3e7bb88656110c46d4;hb=7659d3c9c7c6dc87d3d2be1391f123c15553a1a4;hp=85389a095e034a9c490c5f24f29c69bc659e2d7d;hpb=36352e8dee9767b21c5a90ea50f22a07a11b552c;p=ghc-base.git

diff --git a/System/Posix/Types.hs b/System/Posix/Types.hs
index 85389a0..f24fed1 100644
--- 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,23 +14,61 @@
 --
 -----------------------------------------------------------------------------
 
-#include "config.h"
+#include "HsBaseConfig.h"
 
 module System.Posix.Types (
 
   -- * POSIX data types
-  CDev, CIno, CMode, COff, CPid, CSsize,
+#if defined(HTYPE_DEV_T)
+  CDev,
+#endif
+#if defined(HTYPE_INO_T)
+  CIno,
+#endif
+#if defined(HTYPE_MODE_T)
+  CMode,
+#endif
+#if defined(HTYPE_OFF_T)
+  COff,
+#endif
+#if defined(HTYPE_PID_T)
+  CPid,
+#endif
+#if defined(HTYPE_SIZE_T) || defined(HTYPE_SSIZE_T)
+  CSsize,
+#endif
 
-#ifndef mingw32_TARGET_OS
-  CGid, CNlink, CUid, CCc, CSpeed,
-  CTcflag, CRLim,
+#if defined(HTYPE_GID_T)
+  CGid,
+#endif
+#if defined(HTYPE_NLINK_T)
+  CNlink,
+#endif
+#if defined(HTYPE_UID_T)
+  CUid,
+#endif
+#if defined(HTYPE_CC_T)
+  CCc,
+#endif
+#if defined(HTYPE_SPEED_T)
+  CSpeed,
+#endif
+#if defined(HTYPE_TCFLAG_T)
+  CTcflag,
+#endif
+#if defined(HTYPE_RLIM_T)
+  CRLim,
 #endif
 
   Fd(..),
 
-#ifndef mingw32_TARGET_OS
+#if defined(HTYPE_NLINK_T)
   LinkCount,
+#endif
+#if defined(HTYPE_UID_T)
   UserID,
+#endif
+#if defined(HTYPE_GID_T)
   GroupID,
 #endif
 
@@ -42,12 +80,13 @@ module System.Posix.Types (
   ProcessGroupID,
   DeviceID,
   FileID,
-  FileMode
+  FileMode,
+  Limit
  ) where
 
 import Foreign
 import Foreign.C
-import Data.Dynamic
+import Data.Typeable
 import Data.Bits
 
 #ifdef __GLASGOW_HASKELL__
@@ -62,28 +101,52 @@ import GHC.Show
 import Control.Monad
 #endif
 
-#include "Dynamic.h"
 #include "CTypes.h"
 
-NUMERIC_TYPE(CDev,tyConCDev,"CDev",HTYPE_DEV_T)
+#if defined(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)
+#endif
+#if defined(HTYPE_MODE_T)
 INTEGRAL_TYPE(CMode,tyConCMode,"CMode",HTYPE_MODE_T)
+#endif
+#if defined(HTYPE_OFF_T)
 INTEGRAL_TYPE(COff,tyConCOff,"COff",HTYPE_OFF_T)
+#endif
+#if defined(HTYPE_PID_T)
 INTEGRAL_TYPE(CPid,tyConCPid,"CPid",HTYPE_PID_T)
+#endif
 
-#ifdef mingw32_TARGET_OS
+#if defined(HTYPE_SIZE_T)
 INTEGRAL_TYPE(CSsize,tyConCSsize,"CSsize",HTYPE_SIZE_T)
-#else
+#endif
+
+#if defined(HTYPE_SSIZE_T) && !defined(HTYPE_SIZE_T)
 INTEGRAL_TYPE(CSsize,tyConCSsize,"CSsize",HTYPE_SSIZE_T)
 #endif
 
-#ifndef mingw32_TARGET_OS
+#if defined(HTYPE_GID_T)
 INTEGRAL_TYPE(CGid,tyConCGid,"CGid",HTYPE_GID_T)
+#endif
+#if defined(HTYPE_NLINK_T)
 INTEGRAL_TYPE(CNlink,tyConCNlink,"CNlink",HTYPE_NLINK_T)
+#endif
+
+#if defined(HTYPE_UID_T)
 INTEGRAL_TYPE(CUid,tyConCUid,"CUid",HTYPE_UID_T)
-NUMERIC_TYPE(CCc,tyConCCc,"CCc",HTYPE_CC_T)
-NUMERIC_TYPE(CSpeed,tyConCSpeed,"CSpeed",HTYPE_SPEED_T)
+#endif
+#if defined(HTYPE_CC_T)
+ARITHMETIC_TYPE(CCc,tyConCCc,"CCc",HTYPE_CC_T)
+#endif
+#if defined(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)
+#endif
+#if defined(HTYPE_RLIM_T)
 INTEGRAL_TYPE(CRLim,tyConCRlim,"CRLim",HTYPE_RLIM_T)
 #endif
 
@@ -94,9 +157,13 @@ INTEGRAL_TYPE(CRLim,tyConCRlim,"CRLim",HTYPE_RLIM_T)
 INTEGRAL_TYPE(Fd,tyConFd,"Fd",CInt)
 
 -- nicer names, and backwards compatibility with POSIX library:
-#ifndef mingw32_TARGET_OS
+#if defined(HTYPE_NLINK_T)
 type LinkCount      = CNlink
+#endif
+#if defined(HTYPE_UID_T)
 type UserID         = CUid
+#endif
+#if defined(HTYPE_GID_T)
 type GroupID        = CGid
 #endif
 
@@ -109,3 +176,5 @@ type FileMode       = CMode
 type ProcessID      = CPid
 type FileOffset     = COff
 type ProcessGroupID = CPid
+type Limit	    = CLong
+