LDLIBS removed from dependency lists (some makes don't support this).

An `ambiguous else' warning from some compilers in types.c is removed.

diff --git a/changelog b/changelog
index 31429b0f0f7e25a23e31023be0064f6c64f52145..bb54f979d7bd3c06bb6cce74c0a20034a2ec5996 100644 (file)
--- a/changelog
+++ b/changelog
@@ -8,9 +8,9 @@ adns (0.2) experimental; urgency=low
   * Include <sys/times.h> in a few more files.
   * Include <unistd.h> and <sys/time.h> for select.
   * Look for inet_aton and inet_ntoa (in -lnsl and -lsocket).
-
-  Portability fixes to regression test:
-  * Regression test doesn't rely on value of O_NONBLOCK and other flags.
+  * Regression test doesn't rely on value of fcntl flags eg O_NONBLOCK.
+  * LDLIBS removed from dependency lists (some makes don't support this).
+  * An `ambiguous else' warning from some compilers in types.c is removed.
 
   Other changes:
   * Added COPYING (copy of the GPL).

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 9a249c25ddd69fbac974af2e55c645d8b0aff9c1..2055f08cb2c3de45b527da49b45f5ba709d40cc9 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -32,7 +32,7 @@ HCPPFLAGS:= $(foreach F,                      \
        sendto recvfrom read write writev       \
 , -D$F=H$F)
 
-HARNLOBJS=     $(addsuffix _d.o, $(basename $(LIBOBJS))) $(LDLIBS)
+HARNLOBJS=     $(addsuffix _d.o, $(basename $(LIBOBJS)))
 ALLOBJS=       $(HARNLOBJS) dtest.o hrecord.o hplayback.o hcommon.o
 
 .PRECIOUS:     $(AUTOCSRCS)

diff --git a/src/types.c b/src/types.c
index c1d613af64008762732eae80fa938e980ec3ded3..2e1291a5bb843fdd8ee882375789ebc956f1701a 100644 (file)
--- a/src/types.c
+++ b/src/types.c
@@ -31,7 +31,7 @@
 #include "internal.h"
 
 #define R_NOMEM           return adns_s_nomemory
-#define CSP_ADDSTR(s)     if (!adns__vbuf_appendstr(vb,(s))) R_NOMEM; else;
+#define CSP_ADDSTR(s)     do { if (!adns__vbuf_appendstr(vb,(s))) R_NOMEM; } while (0)
 
 /*
  * order of sections: