From 4268cba9f084edcfae738318d4a639ea40222271 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 19 Aug 1998 18:58:16 +0000 Subject: [PATCH] Rename old regex.h (BSD re_comp) to compat_regex.h to support new regex(3) code. FreeBSD has re_comp in -lcompat. Use of re_comp/exec for all platforms should be depreciated completely. --- include/{regex.h => compat_regex.h} | 0 include/portable.h | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) rename include/{regex.h => compat_regex.h} (100%) diff --git a/include/regex.h b/include/compat_regex.h similarity index 100% rename from include/regex.h rename to include/compat_regex.h diff --git a/include/portable.h b/include/portable.h index a91b27a5d5..8d08f6feff 100644 --- a/include/portable.h +++ b/include/portable.h @@ -61,9 +61,9 @@ #endif /* - * on many systems, we should use waitpid() instead of waitN() + * on most systems, we should use waitpid() instead of waitN() */ -#if !defined( USE_WAITPID ) && ( defined( SYSV ) || defined( sunos4 ) || defined( ultrix ) || defined( aix )) +#if !defined( USE_WAITPID ) && !defined( nextstep ) #define USE_WAITPID #endif @@ -101,7 +101,7 @@ * some systems don't have the BSD re_comp and re_exec routines */ #ifndef NEED_BSDREGEX -#if defined( SYSV ) || defined( VMS ) || defined( netbsd ) || defined( freebsd ) || defined( linux ) +#if defined( SYSV ) || defined( VMS ) || defined( netbsd ) || defined( linux ) #define NEED_BSDREGEX #endif #endif @@ -120,7 +120,7 @@ * Are sys_errlist and sys_nerr declared in stdio.h? */ #ifndef SYSERRLIST_IN_STDIO -#if defined( freebsd ) +#if defined( freebsd ) || defined( __GLIBC__ ) && ( __GLIBC__ > 1 ) #define SYSERRLIST_IN_STDIO #endif #endif @@ -170,7 +170,7 @@ * call signal or sigset (signal does not block the signal while * in the handler on sys v and sigset does not exist on bsd) */ -#ifdef SYSV +#if defined(SYSV) && !defined(linux) #define SIGNAL sigset #else #define SIGNAL signal -- 2.47.2