Make compile on AIX, Alpha OSF. Thanks Darren King, Igor Notanzon.

1 files changed, 48 insertions, 50 deletions

diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h
index 0c4ef422a23..08f561d4132 100644
--- a/src/include/regex/regex.h
+++ b/src/include/regex/regex.h
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 1992 Henry Spencer.
  * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
+ *      The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Henry Spencer of the University of Toronto.
@@ -16,8 +16,8 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)regex.h	8.2 (Berkeley) 1/3/94
+ *      @(#)regex.h     8.2 (Berkeley) 1/3/94
  */
 
 #ifndef _REGEX_H_
-#define	_REGEX_H_
+#define _REGEX_H_
 
 #include <sys/types.h>
 
@@ -46,61 +46,59 @@
 typedef off_t regoff_t;
 
 typedef struct {
-	int re_magic;
-	size_t re_nsub;		/* number of parenthesized subexpressions */
-	__const char *re_endp;	/* end pointer for REG_PEND */
-	struct re_guts *re_g;	/* none of your business :-) */
+        int re_magic;
+        size_t re_nsub;         /* number of parenthesized subexpressions */
+        const char *re_endp;    /* end pointer for REG_PEND */
+        struct re_guts *re_g;   /* none of your business :-) */
 } regex_t;
 
 typedef struct {
-	regoff_t rm_so;		/* start of match */
-	regoff_t rm_eo;		/* end of match */
+        regoff_t rm_so;         /* start of match */
+        regoff_t rm_eo;         /* end of match */
 } regmatch_t;
 
 /* regcomp() flags */
-#define	REG_BASIC	0000
-#define	REG_EXTENDED	0001
-#define	REG_ICASE	0002
-#define	REG_NOSUB	0004
-#define	REG_NEWLINE	0010
-#define	REG_NOSPEC	0020
-#define	REG_PEND	0040
-#define	REG_DUMP	0200
+#define REG_BASIC       0000
+#define REG_EXTENDED    0001
+#define REG_ICASE       0002
+#define REG_NOSUB       0004
+#define REG_NEWLINE     0010
+#define REG_NOSPEC      0020
+#define REG_PEND        0040
+#define REG_DUMP        0200
 
 /* regerror() flags */
-#define	REG_NOMATCH	 1
-#define	REG_BADPAT	 2
-#define	REG_ECOLLATE	 3
-#define	REG_ECTYPE	 4
-#define	REG_EESCAPE	 5
-#define	REG_ESUBREG	 6
-#define	REG_EBRACK	 7
-#define	REG_EPAREN	 8
-#define	REG_EBRACE	 9
-#define	REG_BADBR	10
-#define	REG_ERANGE	11
-#define	REG_ESPACE	12
-#define	REG_BADRPT	13
-#define	REG_EMPTY	14
-#define	REG_ASSERT	15
-#define	REG_INVARG	16
-#define	REG_ATOI	255	/* convert name to number (!) */
-#define	REG_ITOA	0400	/* convert number to name (!) */
+#define REG_NOMATCH      1
+#define REG_BADPAT       2
+#define REG_ECOLLATE     3
+#define REG_ECTYPE       4
+#define REG_EESCAPE      5
+#define REG_ESUBREG      6
+#define REG_EBRACK       7
+#define REG_EPAREN       8
+#define REG_EBRACE       9
+#define REG_BADBR       10
+#define REG_ERANGE      11
+#define REG_ESPACE      12
+#define REG_BADRPT      13
+#define REG_EMPTY       14
+#define REG_ASSERT      15
+#define REG_INVARG      16
+#define REG_ATOI        255     /* convert name to number (!) */
+#define REG_ITOA        0400    /* convert number to name (!) */
 
 /* regexec() flags */
-#define	REG_NOTBOL	00001
-#define	REG_NOTEOL	00002
-#define	REG_STARTEND	00004
-#define	REG_TRACE	00400	/* tracing of execution */
-#define	REG_LARGE	01000	/* force large representation */
-#define	REG_BACKR	02000	/* force use of backref code */
+#define REG_NOTBOL      00001
+#define REG_NOTEOL      00002
+#define REG_STARTEND    00004
+#define REG_TRACE       00400   /* tracing of execution */
+#define REG_LARGE       01000   /* force large representation */
+#define REG_BACKR       02000   /* force use of backref code */
 
-__BEGIN_DECLS
-int	pg95_regcomp __P((regex_t *, const char *, int));
-size_t	pg95_regerror __P((int, const regex_t *, char *, size_t));
-int	pg95_regexec __P((const regex_t *,
-	    const char *, size_t, regmatch_t [], int));
-void	pg95_regfree __P((regex_t *));
-__END_DECLS
+int     pg95_regcomp(regex_t *, const char *, int);
+size_t  pg95_regerror(int, const regex_t *, char *, size_t);
+int     pg95_regexec (const regex_t *,
+                      const char *, size_t, regmatch_t [], int);
+void    pg95_regfree (regex_t *);
 
 #endif /* !_REGEX_H_ */