From d4d67c5fdf35d76f9c95532acfce632a6213ac1d Mon Sep 17 00:00:00 2001 From: oetiker Date: Thu, 9 Jul 2009 20:14:29 +0000 Subject: [PATCH] Silence automake portability warnings caused by multiple inference rules. -- kevin brintnall git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1868 a5681a0c-68f1-0310-ab6d-d61299d08faa --- doc/Makefile.am | 4 ++-- src/rrd_thread_safe.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 617beb3..4af8d7b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,8 +1,8 @@ ## Process this file with automake to produce Makefile.in -SUFFIXES = .pod .1 .man .html .txt .pm .pdf .inc +SUFFIXES = .pod .pl .1 .man .html .txt .pm .pdf .inc -#AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign #ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4 diff --git a/src/rrd_thread_safe.c b/src/rrd_thread_safe.c index 6e30115..e1e3cbe 100644 --- a/src/rrd_thread_safe.c +++ b/src/rrd_thread_safe.c @@ -66,7 +66,7 @@ const char *rrd_strerror( /* Even though POSIX/XSI requires "strerror_r" to return an "int", some * systems (e.g. the GNU libc) return a "char *" _and_ ignore the second * argument ... -tokkee */ -#if STRERROR_R_CHAR_P +#ifdef STRERROR_R_CHAR_P ret = strerror_r(err, ctx->lib_errstr, sizeof(ctx->lib_errstr)); if ((! ret) || (*ret == '\0')) { if (*ctx->lib_errstr != '\0') -- 2.11.0