X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fadns.h;h=21bc52495d73960ac913dc01551657715215e25d;hb=c3ca23bb1821f820dfa889dc006599b5df8af32f;hp=4f25dc7246529a5e6e711ea568767539f4b6faa2;hpb=958ad1f072aa889debf6bdde8f042678f5335952;p=adns.git

diff --git a/src/adns.h b/src/adns.h
index 4f25dc7..21bc524 100644
--- a/src/adns.h
+++ b/src/adns.h
@@ -24,6 +24,9 @@
 
 #ifndef ADNS_H_INCLUDED
 #define ADNS_H_INCLUDED
+#ifdef __cplusplus
+extern "C" { /* I really dislike this - iwj. */
+#endif
 
 #include <stdio.h>
 
@@ -306,7 +309,7 @@ void adns_finish(adns_state ads);
 
 
 void adns_forallqueries_begin(adns_state ads);
-struct adns_query adns_forallqueries_next(adns_state ads, void **context_r);
+adns_query adns_forallqueries_next(adns_state ads, void **context_r);
 /* Iterator functions, which you can use to loop over the outstanding
  * (submitted but not yet successfuly checked/waited) queries.
  *
@@ -319,7 +322,7 @@ struct adns_query adns_forallqueries_next(adns_state ads, void **context_r);
  * query in the same adns_state).  There is no need to explicitly
  * finish an iteration.
  *
- * context_r may be 0.
+ * context_r may be 0.  *context_r may not be set when _next returns 0.
  */
 
 /*
@@ -564,4 +567,7 @@ const char *adns_errabbrev(adns_status st);
  * not returned by the same adns library.
  */
 
+#ifdef __cplusplus
+} /* end of extern "C" */
+#endif
 #endif