[trac494] moved extra callback layer to its own file

src/lib/resolve/Makefile.am

@@ -10,7 +10,8 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
 CLEANFILES = *.gcno *.gcda
 
 lib_LTLIBRARIES = libresolve.la
-libresolve_la_SOURCES = resolve.h resolve.cc
+libresolve_la_SOURCES = resolve.h
 libresolve_la_SOURCES += resolver_interface.h
+libresolve_la_SOURCES += resolver_callback.h resolver_callback.cc
 libresolve_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la
 libresolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la

src/lib/resolve/resolve.cc

@@ -12,7 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <resolve/resolve.h>
+#include <resolve/resolver_callback.h>
 
 namespace isc {
 namespace resolve {

src/lib/resolve/resolve.h

@@ -12,8 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef _ISC_RESOLVE_H
-#define _ISC_RESOLVE_H 1
+#ifndef _ISC_RESOLVER_CALLBACK_H
+#define _ISC_RESOLVER_CALLBACK_H 1
 
 #include <asiolink/asiolink.h>
 
@@ -59,4 +59,4 @@ private:
 } //namespace resolve
 } //namespace isc
 
-#endif // ISC_RESOLVE_H_
+#endif // ISC_RESOLVER_CALLBACK_H_