From: ian <ian>
Date: Mon, 3 Apr 2006 22:49:32 +0000 (+0000)
Subject: @@ -3,10 +3,12 @@
X-Git-Tag: wip.base.getaddrinfo~75
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=7a1f00f74013080b78d562ade8b4c74a56dbca1e

@@ -3,10 +3,12 @@
   * Include reference to Peter Simons's Haskell bindings
     in README.html.

-  Fixes from Bernd Eckenfels, the Debian maintainer:
+  Fixes from or suggested by Bernd Eckenfels, the Debian maintainer:
   * Correct type of various printf arguments: ptrdiff_t != int.
   * Do not print size of leaked blocks of memory (this causes
-    a spurious regression test failure).
+    a spurious regression test failure on some platforms)
+  * Provide adns_if_none and adns_qf_none (which will help with compilers
+    which complain about plain `0' being passed where an enum is wanted).

  --
---

diff --git a/changelog b/changelog
index b1edb55..7dc9915 100644
--- a/changelog
+++ b/changelog
@@ -3,10 +3,12 @@ adns (1.1.999.0.2); urgency=medium
   * Include reference to Peter Simons's Haskell bindings
     in README.html.
 
-  Fixes from Bernd Eckenfels, the Debian maintainer:
+  Fixes from or suggested by Bernd Eckenfels, the Debian maintainer:
   * Correct type of various printf arguments: ptrdiff_t != int.
   * Do not print size of leaked blocks of memory (this causes
-    a spurious regression test failure).
+    a spurious regression test failure on some platforms)
+  * Provide adns_if_none and adns_qf_none (which will help with compilers
+    which complain about plain `0' being passed where an enum is wanted).
 
  --
 
diff --git a/src/adns.h b/src/adns.h
index f41bb3f..abeba06 100644
--- a/src/adns.h
+++ b/src/adns.h
@@ -51,7 +51,7 @@
  *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  *
- *  $Id: adns.h,v 1.87 2006/01/07 17:08:04 ian Exp $
+ *  $Id: adns.h,v 1.88 2006/04/03 22:49:32 ian Exp $
  */
 
 #ifndef ADNS_H_INCLUDED
@@ -75,7 +75,8 @@ extern "C" { /* I really dislike this - iwj. */
 typedef struct adns__state *adns_state;
 typedef struct adns__query *adns_query;
 
-typedef enum {
+typedef enum { /* In general, or together the desired flags: */
+ adns_if_none=        0x0000,/* no flags.  nicer than 0 for some compilers */
  adns_if_noenv=       0x0001,/* do not look at environment */
  adns_if_noerrprint=  0x0002,/* never print to stderr (_debug overrides) */
  adns_if_noserverwarn=0x0004,/* do not warn to stderr about duff servers etc */
@@ -88,7 +89,8 @@ typedef enum {
  adns_if_checkc_freq= 0x0300 /* consistency checks very frequently (slow!) */
 } adns_initflags;
 
-typedef enum {
+typedef enum { /* In general, or together the desired flags: */
+ adns_qf_none=           0x00000000,/* no flags */
  adns_qf_search=         0x00000001,/* use the searchlist */
  adns_qf_usevc=          0x00000002,/* use a virtual circuit (TCP conn) */
  adns_qf_owner=          0x00000004,/* fill in the owner field in the answer */