From 7efc8ef1a181bae8e9e74a19dddc15a8cecfb8e9 Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Sat, 21 Sep 1996 06:31:13 +0000 Subject: [PATCH] |For starters, here's a small patch that removes a compiler warning in that |regex stuff on Linux. | |-- |Bryan Henderson Phone 408-227-6803 |San Jose, California | --- src/include/regex/cdefs.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/include/regex/cdefs.h b/src/include/regex/cdefs.h index cdca2af164..3a548f3ea1 100644 --- a/src/include/regex/cdefs.h +++ b/src/include/regex/cdefs.h @@ -55,7 +55,7 @@ /* * @(#)cdefs.h 8.1 (Berkeley) 6/2/93 - * $Id: cdefs.h,v 1.1 1996/09/20 05:29:23 scrappy Exp $ + * $Id: cdefs.h,v 1.2 1996/09/21 06:31:13 scrappy Exp $ */ #ifndef _CDEFS_H_ @@ -77,7 +77,14 @@ * strings produced by the __STRING macro, but this only works with ANSI C. */ #if defined(__STDC__) || defined(__cplusplus) +/* + * Some headers in the Linux C library define __P the same as here, + * but with different argument variable name. This causes a compiler + * warning! So we avoid the redefinition. + */ +#if !defined(__P) #define __P(protos) protos /* full-blown ANSI C */ +#endif #define __CONCAT(x,y) x ## y #define __STRING(x) #x