summaryrefslogtreecommitdiffstats
path: root/gnu/lib/libg++
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1994-12-09 01:08:01 +0000
committerache <ache@FreeBSD.org>1994-12-09 01:08:01 +0000
commitb177687c4a182f842ed5e36b7962f16e12b92190 (patch)
treeeab3831729696a7d11e565f12d14f16b37d881d7 /gnu/lib/libg++
parentada37f51db94ea1e4846737f8824903641aed810 (diff)
downloadFreeBSD-src-b177687c4a182f842ed5e36b7962f16e12b92190.zip
FreeBSD-src-b177687c4a182f842ed5e36b7962f16e12b92190.tar.gz
More kosher regexp eliminating, based on BSD date now
Diffstat (limited to 'gnu/lib/libg++')
-rw-r--r--gnu/lib/libg++/librx/rx.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/lib/libg++/librx/rx.c b/gnu/lib/libg++/librx/rx.c
index 19ddd908..8bd54be 100644
--- a/gnu/lib/libg++/librx/rx.c
+++ b/gnu/lib/libg++/librx/rx.c
@@ -33,7 +33,6 @@ char rx_version_string[] = "GNU Rx version 0.06";
#include <stdio.h>
-#include <unistd.h> /* For _POSIX_VERSION */
#include <ctype.h>
#ifndef isgraph
#define isgraph(c) (isprint (c) && !isspace (c))
@@ -6814,10 +6813,11 @@ re_compile_fastmap (rxb)
+#if !defined(BSD) || (BSD < 199306)
/* Entry points compatible with 4.2 BSD regex library. We don't define
them if this is an Emacs or POSIX compilation. */
-#if (!defined (emacs) && !defined (_POSIX_VERSION)) || defined(USE_BSD_REGEX)
+#if (!defined (emacs) && !defined (_POSIX_SOURCE)) || defined(USE_BSD_REGEX)
/* BSD has one and only one pattern buffer. */
static struct re_pattern_buffer rx_comp_buf;
@@ -6886,13 +6886,13 @@ re_exec (s)
return
0 <= re_search (&rx_comp_buf, s, len, 0, len, (struct re_registers *) 0);
}
-#endif /* not emacs and not _POSIX_VERSION */
+#endif /* not emacs and not _POSIX_SOURCE */
/* POSIX.2 functions. Don't define these for Emacs. */
-#if !defined(emacs) && !defined(_POSIX_VERSION)
+#if !defined(emacs)
/* regcomp takes a regular expression as a string and compiles it.
@@ -7152,8 +7152,8 @@ regfree (preg)
preg->translate = 0;
}
-#endif /* not emacs && not POSIX */
-
+#endif /* not emacs */
+#endif /* not BSD4.4 */
OpenPOWER on IntegriCloud