dtdocbook/regexp.c, remove register keyword

diff --git a/cde/programs/dtdocbook/lib/tptregexp/regexp.c b/cde/programs/dtdocbook/lib/tptregexp/regexp.c
index 0f151af9ab8d0eb9770024e901aad8d556c0a631..63a5d7954ec2d8eacd97c3499a10f2ad7453d2f9 100644 (file)
--- 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;