Silence automake portability warnings caused by multiple inference rules. -- kevin...

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1868 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/doc/Makefile.am b/program/doc/Makefile.am
index 617beb3625f3a71b7bf4b4761005a4668099ea1a..4af8d7b02a15a67181e9dba64eaf9cc2490bba9f 100644 (file)
--- a/program/doc/Makefile.am
+++ b/program/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/program/src/rrd_thread_safe.c b/program/src/rrd_thread_safe.c
index 6e30115bf7ea61a30a66435015f33adacf7269b3..e1e3cbeaa1b660b3b698de0f504738c4ec961683 100644 (file)
--- a/program/src/rrd_thread_safe.c
+++ b/program/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')