From: ross <unknown>
Date: Mon, 6 Sep 2004 09:07:47 +0000 (+0000)
Subject: [project @ 2004-09-06 09:07:45 by ross]
X-Git-Tag: nhc98-1-18-release~256
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=3552939f68d926b9aa06728f82f68275ce925b17;p=ghc-base.git

[project @ 2004-09-06 09:07:45 by ross]
Text.Regex.Posix is portable (because it includes an implementation)
---

diff --git a/Text/Regex.hs b/Text/Regex.hs
index 7957151..f6ffe59 100644
--- a/Text/Regex.hs
+++ b/Text/Regex.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS -cpp #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.Regex
@@ -7,22 +6,19 @@
 -- 
 -- Maintainer  :  libraries@haskell.org
 -- Stability   :  experimental
--- Portability :  non-portable (only on platforms that provide a regex lib)
+-- Portability :  portable
 --
 -- Regular expression matching.  Uses the POSIX regular expression
 -- interface in "Text.Regex.Posix".
 --
 -----------------------------------------------------------------------------
-#include "ghcconfig.h"
 module Text.Regex (
     -- * Regular expressions
     Regex,
-#if !defined(__HUGS__) || defined(HAVE_REGEX_H)
     mkRegex,
     mkRegexWithOpts,
     matchRegex,
     matchRegexAll
-#endif
   ) where
 
 import Prelude
@@ -30,7 +26,6 @@ import qualified Text.Regex.Posix as RE
 import Text.Regex.Posix ( Regex )
 import System.IO.Unsafe
 
-#if !defined(__HUGS__) || defined(HAVE_REGEX_H)
 -- | Makes a regular expression with the default options (multi-line,
 -- case-sensitive).  The syntax of regular expressions is
 -- otherwise that of @egrep@ (i.e. POSIX \"extended\" regular
@@ -83,5 +78,3 @@ matchRegexAll
 		-- >         subexpression matches )
 
 matchRegexAll p str = unsafePerformIO (RE.regexec p str)
-
-#endif
diff --git a/Text/Regex/Posix.hsc b/Text/Regex/Posix.hsc
index 6664165..5ab5c9a 100644
--- a/Text/Regex/Posix.hsc
+++ b/Text/Regex/Posix.hsc
@@ -6,7 +6,7 @@
 -- 
 -- Maintainer  :  libraries@haskell.org
 -- Stability   :  experimental
--- Portability :  non-portable (needs POSIX regexps)
+-- Portability :  portable
 --
 -- Interface to the POSIX regular expression library.
 --