summaryrefslogtreecommitdiff
path: root/libguile/regex-posix.c
diff options
context:
space:
mode:
Diffstat (limited to 'libguile/regex-posix.c')
-rw-r--r--libguile/regex-posix.c76
1 files changed, 36 insertions, 40 deletions
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index d3dd6d876..a08da02db 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1997-2001, 2004, 2006, 2007, 2010-2012, 2018
- * Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
+/* Copyright 1997-2001,2004,2006-2007,2010-2012,2018-2019
+ Free Software Foundation, Inc.
+
+ This file is part of Guile.
+
+ Guile is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Guile is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with Guile. If not, see
+ <https://www.gnu.org/licenses/>. */
@@ -32,27 +32,29 @@
# include <config.h>
#endif
-#include <sys/types.h>
-
-#include "libguile/_scm.h"
-
#include <regex.h>
+#include <string.h>
+#include <sys/types.h>
#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif
-#include "libguile/async.h"
-#include "libguile/smob.h"
-#include "libguile/symbols.h"
-#include "libguile/vectors.h"
-#include "libguile/strports.h"
-#include "libguile/ports.h"
-#include "libguile/feature.h"
-#include "libguile/strings.h"
-
-#include "libguile/validate.h"
-#include "libguile/regex-posix.h"
+#include "async.h"
+#include "feature.h"
+#include "gsubr.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "ports.h"
+#include "smob.h"
+#include "strings.h"
+#include "strports.h"
+#include "symbols.h"
+#include "vectors.h"
+
+#include "regex-posix.h"
/* This is defined by some regex libraries and omitted by others. */
#ifndef REG_BASIC
@@ -328,13 +330,7 @@ scm_init_regex_posix ()
scm_c_define ("regexp/notbol", scm_from_int (REG_NOTBOL));
scm_c_define ("regexp/noteol", scm_from_int (REG_NOTEOL));
-#include "libguile/regex-posix.x"
+#include "regex-posix.x"
scm_add_feature ("regex");
}
-
-/*
- Local Variables:
- c-file-style: "gnu"
- End:
-*/