Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / regsub.h

diff --git a/lib/regsub.h b/lib/regsub.h
index c4107e052f8cb568154a16e1a9bfe5986de9c4f4..1c9afc71710327a27493f55e3ccee0bd76af5189 100644 (file)
--- a/lib/regsub.h
+++ b/lib/regsub.h
@@ -15,11 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */

-
+/** @file lib/regsub.h
+ * @brief Regexp substitution
+ */

 #ifndef REGSUB_H
 #define REGSUB_H
 
 #ifndef REGSUB_H
 #define REGSUB_H
 

-#include <pcre.h>
+#include "regexp.h"

 
 #define REGSUB_GLOBAL          0x0001  /* global replace */
 #define REGSUB_MUST_MATCH      0x0002  /* return 0 if no match */
 
 #define REGSUB_GLOBAL          0x0001  /* global replace */
 #define REGSUB_MUST_MATCH      0x0002  /* return 0 if no match */


@@ -32,8 +34,8 @@ unsigned regsub_flags(const char *flags);
 int regsub_compile_options(unsigned flags);
 /* convert compile-time options */
 
 int regsub_compile_options(unsigned flags);
 /* convert compile-time options */
 

-const char *regsub(const pcre *re, const char *subject, const char *replace,
-                  unsigned flags);
+const char *regsub(const regexp *re, const char *subject,
+                  const char *replace, unsigned flags);

 
 #endif /* REGSUB_H */
 
 
 #endif /* REGSUB_H */