mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
dtdocbook/regexp.c, remove register keyword
This commit is contained in:
parent
e0036e6167
commit
44f999c1de
1 changed files with 2 additions and 13 deletions
|
@ -712,13 +712,7 @@ STATIC char *regprop();
|
||||||
- regexec - match a regexp against a string
|
- regexec - match a regexp against a string
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
<<<<<<< ca7d34b7ff5f017e3228714bb583266f7cdf946f
|
tpt_regexec(regexp *prog, char *string)
|
||||||
tpt_regexec(register regexp *prog, register char *string)
|
|
||||||
=======
|
|
||||||
tpt_regexec(prog, string)
|
|
||||||
regexp *prog;
|
|
||||||
char *string;
|
|
||||||
>>>>>>> dtdocbook: remove register keyword
|
|
||||||
{
|
{
|
||||||
char *s;
|
char *s;
|
||||||
|
|
||||||
|
@ -1043,12 +1037,7 @@ regrepeat(char *p)
|
||||||
- regnext - dig the "next" pointer out of a node
|
- regnext - dig the "next" pointer out of a node
|
||||||
*/
|
*/
|
||||||
static char *
|
static char *
|
||||||
<<<<<<< ca7d34b7ff5f017e3228714bb583266f7cdf946f
|
regnext(char *p)
|
||||||
regnext(register char *p)
|
|
||||||
=======
|
|
||||||
regnext(p)
|
|
||||||
char *p;
|
|
||||||
>>>>>>> dtdocbook: remove register keyword
|
|
||||||
{
|
{
|
||||||
int offset;
|
int offset;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue