Libc-763.11.tar.gz

[apple/libc.git] / regex / FreeBSD / regex2.h

diff --git a/regex/FreeBSD/regex2.h b/regex/FreeBSD/regex2.h
index c971c9c3b968e8d1a4a81cf4f4e8d41ded04239b..13bbf64a73c07ea38b8c482660df5ce1644a4b5f 100644 (file)
--- a/regex/FreeBSD/regex2.h
+++ b/regex/FreeBSD/regex2.h
@@ -14,10 +14,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    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.
  * 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.
@@ -35,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *     @(#)regex2.h    8.4 (Berkeley) 3/20/94
- * $FreeBSD: src/lib/libc/regex/regex2.h,v 1.8 2004/07/12 07:35:59 tjr Exp $
+ * $FreeBSD: src/lib/libc/regex/regex2.h,v 1.11 2007/01/09 00:28:04 imp Exp $
  */
 
 /*
@@ -127,9 +123,7 @@ typedef struct {
 } cset;
 
 static int
-CHIN1(cs, ch)
-cset *cs;
-wint_t ch;
+CHIN1(cset *cs, wint_t ch)
 {
        int i;
 
@@ -150,9 +144,7 @@ wint_t ch;
 }
 
 static __inline int
-CHIN(cs, ch)
-cset *cs;
-wint_t ch;
+CHIN(cset *cs, wint_t ch)
 {
 
        assert(ch >= 0);
@@ -196,5 +188,5 @@ struct re_guts {
 };
 
 /* misc utilities */
-#define        OUT     (-2)    /* a non-character value */
+#define        OUT     (CHAR_MIN - 1)  /* a non-character value */
 #define ISWORD(c)       (iswalnum((uch)(c)) || (c) == '_')