svn commit: r292169 - stable/10/lib/libc/regex/grot

[Garrett Cooper]

Author: ngie
Date: Sun Dec 13 21:14:04 2015
New Revision: 292169
URL: https://svnweb.freebsd.org/changeset/base/292169

Log:
  Revert r292168 -- I used the wrong commit message by accident

Modified:
  stable/10/lib/libc/regex/grot/Makefile
  stable/10/lib/libc/regex/grot/main.c
  stable/10/lib/libc/regex/grot/split.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/regex/grot/Makefile
==============================================================================
--- stable/10/lib/libc/regex/grot/Makefile	Sun Dec 13 21:09:46 2015	(r292168)
+++ stable/10/lib/libc/regex/grot/Makefile	Sun Dec 13 21:14:04 2015	(r292169)
@@ -62,8 +62,7 @@ regexec.o:	engine.c engine.ih
 regerror.o:	regerror.ih
 regerror.o:	utils.h
 debug.o:	debug.ih
-main.o:	debug.ih main.ih split.ih
-split.o:	split.ih
+main.o:	main.ih
 
 r:	re tests
 	./re <tests

Modified: stable/10/lib/libc/regex/grot/main.c
==============================================================================
--- stable/10/lib/libc/regex/grot/main.c	Sun Dec 13 21:09:46 2015	(r292168)
+++ stable/10/lib/libc/regex/grot/main.c	Sun Dec 13 21:14:04 2015	(r292169)
@@ -9,9 +9,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-#include "debug.ih"
 #include "main.ih"
-#include "split.ih"
 
 char *progname;
 int debug = 0;
@@ -24,6 +22,9 @@ regoff_t startoff = 0;
 regoff_t endoff = 0;
 
 
+extern int split();
+extern void regprint();
+
 /*
  - main - do the simple case, hand off to regress() for regression
  */

Modified: stable/10/lib/libc/regex/grot/split.c
==============================================================================
--- stable/10/lib/libc/regex/grot/split.c	Sun Dec 13 21:09:46 2015	(r292168)
+++ stable/10/lib/libc/regex/grot/split.c	Sun Dec 13 21:14:04 2015	(r292169)
@@ -4,8 +4,6 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <string.h>
 
-#include "split.ih"
-
 /*
  - split - divide a string into fields, like awk split()
  == int split(char *string, char *fields[], int nfields, char *sep);