From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 28 May 2014 08:20:44 +0000 (+0000)
Subject: From Dag-Erling Smorgrav: The prototype for libworker_event_done_cb()
X-Git-Tag: release-1.5.0rc1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0121c7ad9f64792a75cb1dc4669758646d8e3ea6;p=thirdparty%2Funbound.git

From Dag-Erling Smorgrav: The prototype for libworker_event_done_cb()
needs to be moved from libunbound/libworker.h to libunbound/worker.h.


git-svn-id: file:///svn/unbound/trunk@3140 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index f2b5f6fc2..20688f7e8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -16,7 +16,9 @@
 	  Remove a useless printf which breaks reproducible builds.
 	  Get rid of CONFIGURE_{TARGET,DATE,BUILD_WITH} now that they're
 	  no longer used.  Add unbound-control-setup.sh to the list of
-	  generated files.
+	  generated files.  The prototype for libworker_event_done_cb()
+	  needs to be moved from libunbound/libworker.h to
+	  libunbound/worker.h.
 	- Fixup out-of-directory compile with unbound-control-setup.sh.in.
 	- make depend.
 
diff --git a/libunbound/libworker.h b/libunbound/libworker.h
index 59087ba26..0103b5d88 100644
--- a/libunbound/libworker.h
+++ b/libunbound/libworker.h
@@ -136,10 +136,6 @@ void libworker_delete_event(struct libworker* w);
 /** cleanup the cache to remove all rrset IDs from it, arg is libworker */
 void libworker_alloc_cleanup(void* arg);
 
-/** mesh callback with event results */
-void libworker_event_done_cb(void* arg, int rcode, struct sldns_buffer* buf, 
-	enum sec_status s, char* why_bogus);
-
 /** 
  * fill result from parsed message, on error fills servfail 
  * @param res: is clear at start, filled in at end.
diff --git a/libunbound/worker.h b/libunbound/worker.h
index f6c93890a..d8354c654 100644
--- a/libunbound/worker.h
+++ b/libunbound/worker.h
@@ -91,6 +91,10 @@ void libworker_fg_done_cb(void* arg, int rcode, sldns_buffer* buf,
 void libworker_bg_done_cb(void* arg, int rcode, sldns_buffer* buf, 
 	enum sec_status s, char* why_bogus);
 
+/** mesh callback with event results */
+void libworker_event_done_cb(void* arg, int rcode, struct sldns_buffer* buf, 
+	enum sec_status s, char* why_bogus);
+
 /**
  * Worker signal handler function. User argument is the worker itself.
  * @param sig: signal number.