From: sof Date: Mon, 10 Oct 2005 23:32:51 +0000 (+0000) Subject: [project @ 2005-10-10 23:32:51 by sof] X-Git-Tag: cmm-merge2~16 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=ccd0725300e5529db1776c8221c250307f5ff53c;p=ghc-base.git [project @ 2005-10-10 23:32:51 by sof] CSsize fix: this Haskell type is defined iff HTYPE_SSIZE_T is. Merge to STABLE --- diff --git a/System/Posix/Types.hs b/System/Posix/Types.hs index f24fed1..7ade7bf 100644 --- a/System/Posix/Types.hs +++ b/System/Posix/Types.hs @@ -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 @@ -119,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