freshen to upstream CVS head

[debian/pax] / pat_rep.h

diff --git a/pat_rep.h b/pat_rep.h
index b41f1e12fc405a7368285b60e84023e05ba3c76c..adef65f2c03aa1e4c5d3e8ed3686f31b6ebc7b78 100644 (file)
--- a/pat_rep.h
+++ b/pat_rep.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pat_rep.h,v 1.2 1996/06/23 14:20:38 deraadt Exp $     */
+/*     $OpenBSD: pat_rep.h,v 1.4 2003/06/02 23:32:08 millert Exp $     */
 /*     $NetBSD: pat_rep.h,v 1.3 1995/03/21 09:07:35 cgd Exp $  */
 
 /*-
@@ -17,11 +17,7 @@
  * 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
+ * 3. 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.
  *
@@ -45,11 +41,7 @@
  */
 typedef struct replace {
        char            *nstr;  /* the new string we will substitute with */
-#      ifdef NET2_REGEX
-       regexp          *rcmp;  /* compiled regular expression used to match */
-#      else
        regex_t         rcmp;   /* compiled regular expression used to match */
-#      endif
        int             flgs;   /* print conversions? global in operation?  */
 #define        PRNT            0x1
 #define        GLOB            0x2