From 44f999c1debdbc636946bef65f55a191f9a205d1 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Wed, 27 Jun 2018 22:23:40 -0600 Subject: [PATCH] dtdocbook/regexp.c, remove register keyword --- cde/programs/dtdocbook/lib/tptregexp/regexp.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/cde/programs/dtdocbook/lib/tptregexp/regexp.c b/cde/programs/dtdocbook/lib/tptregexp/regexp.c index 0f151af9..63a5d795 100644 --- a/cde/programs/dtdocbook/lib/tptregexp/regexp.c +++ b/cde/programs/dtdocbook/lib/tptregexp/regexp.c @@ -712,13 +712,7 @@ STATIC char *regprop(); - regexec - match a regexp against a string */ int -<<<<<<< ca7d34b7ff5f017e3228714bb583266f7cdf946f -tpt_regexec(register regexp *prog, register char *string) -======= -tpt_regexec(prog, string) -regexp *prog; -char *string; ->>>>>>> dtdocbook: remove register keyword +tpt_regexec(regexp *prog, char *string) { char *s; @@ -1043,12 +1037,7 @@ regrepeat(char *p) - regnext - dig the "next" pointer out of a node */ static char * -<<<<<<< ca7d34b7ff5f017e3228714bb583266f7cdf946f -regnext(register char *p) -======= -regnext(p) -char *p; ->>>>>>> dtdocbook: remove register keyword +regnext(char *p) { int offset; -- 2.25.1