summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc G. Fournier1996-09-21 06:31:13 +0000
committerMarc G. Fournier1996-09-21 06:31:13 +0000
commit26ac46c05446c003e8606f02da99033052a462c5 (patch)
tree9cc121ddbb1964cb82092cbdc7d388aa2f9d25e2
parent3e13402ef0c673ae83a8f680e655acf9ab84d215 (diff)
|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 |
-rw-r--r--src/include/regex/cdefs.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/include/regex/cdefs.h b/src/include/regex/cdefs.h
index f950e218e4..6b28be4a12 100644
--- a/src/include/regex/cdefs.h
+++ b/src/include/regex/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