summaryrefslogtreecommitdiff
path: root/textproc/nbsed
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2003-08-23 22:13:56 +0000
committerjschauma <jschauma@pkgsrc.org>2003-08-23 22:13:56 +0000
commit0823098b1fd80393d14b886823247e04b7e862a2 (patch)
tree35f862e13154bd3fdee6590c8932a6416d71cfe9 /textproc/nbsed
parent564536eacbc7cad16138bd6245ac3d9b8505a25e (diff)
downloadpkgsrc-0823098b1fd80393d14b886823247e04b7e862a2.tar.gz
Synch with basesrc:
The 'inline' keyword is a nonstandard extension of GCC, AFAIK. MipsPro does not like it, so remove it. Add fgetln prototype ifndef HAVE_FGETLN. This makes this compile on Irix with the MipsPro Compiler as well as gcc.
Diffstat (limited to 'textproc/nbsed')
-rw-r--r--textproc/nbsed/files/defs.h8
-rw-r--r--textproc/nbsed/files/process.c12
2 files changed, 12 insertions, 8 deletions
diff --git a/textproc/nbsed/files/defs.h b/textproc/nbsed/files/defs.h
index 6e91404c401..18401f68a57 100644
--- a/textproc/nbsed/files/defs.h
+++ b/textproc/nbsed/files/defs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.1.1.1 2003/08/18 17:34:59 agc Exp $ */
+/* $NetBSD: defs.h,v 1.2 2003/08/23 22:13:56 jschauma Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*
* from: @(#)defs.h 8.1 (Berkeley) 6/6/93
- * $NetBSD: defs.h,v 1.1.1.1 2003/08/18 17:34:59 agc Exp $
+ * $NetBSD: defs.h,v 1.2 2003/08/23 22:13:56 jschauma Exp $
*/
/*
@@ -150,3 +150,7 @@ typedef struct {
#ifndef DEFFILEMODE
#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#endif
+
+#ifndef HAVE_FGETLN
+char *fgetln(FILE *, size_t *);
+#endif
diff --git a/textproc/nbsed/files/process.c b/textproc/nbsed/files/process.c
index fa7ee70bee7..045778f94e7 100644
--- a/textproc/nbsed/files/process.c
+++ b/textproc/nbsed/files/process.c
@@ -1,4 +1,4 @@
-/* $NetBSD: process.c,v 1.1.1.1 2003/08/18 17:34:59 agc Exp $ */
+/* $NetBSD: process.c,v 1.2 2003/08/23 22:13:56 jschauma Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -47,7 +47,7 @@
#if 0
static char sccsid[] = "@(#)process.c 8.6 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: process.c,v 1.1.1.1 2003/08/18 17:34:59 agc Exp $");
+__RCSID("$NetBSD: process.c,v 1.2 2003/08/23 22:13:56 jschauma Exp $");
#endif
#endif /* not lint */
@@ -103,10 +103,10 @@ static SPACE HS, PS, SS;
#define hs HS.space
#define hsl HS.len
-static inline int applies(struct s_command *);
+static int applies(struct s_command *);
static void flush_appends(void);
static void lputs(char *);
-static inline int regexec_e(regex_t *, const char *, int, int, size_t);
+static int regexec_e(regex_t *, const char *, int, int, size_t);
static void regsub(SPACE *, char *, char *);
static int substitute(struct s_command *);
@@ -310,7 +310,7 @@ new: if (!nflag && !pd)
* Return TRUE if the command applies to the current line. Sets the inrange
* flag to process ranges. Interprets the non-select (``!'') flag.
*/
-static inline int
+static int
applies(struct s_command *cp)
{
int r;
@@ -539,7 +539,7 @@ lputs(char *s)
err(FATAL, "stdout: %s", strerror(errno ? errno : EIO));
}
-static inline int
+static int
regexec_e(regex_t *preg, const char *string, int eflags, int nomatch, size_t slen)
{
int eval;