From c9b3ed898e20afb5de41cdba1108280d2695bd93 Mon Sep 17 00:00:00 2001
From: Nitin Singh <nitsingh@verisign.com>
Date: Tue, 11 Feb 2014 16:39:35 -0500
Subject: [PATCH]  fix merge issue

---
 src/test/check_getdns.c              | 1 +
 src/test/check_getdns_service_sync.h | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/check_getdns.c b/src/test/check_getdns.c
index 14853d68..cf7c847b 100644
--- a/src/test/check_getdns.c
+++ b/src/test/check_getdns.c
@@ -85,6 +85,7 @@ main (int argc, char** argv)
   Suite *getdns_context_set_upstream_recursive_servers_suite(void);
   Suite *getdns_service_suite(void);
   Suite *getdns_service_sync_suite(void);
+  Suite *getdns_context_set_timeout_suite(void);
 
   sr = srunner_create(getdns_general_suite());
   srunner_add_suite(sr, getdns_general_sync_suite());
diff --git a/src/test/check_getdns_service_sync.h b/src/test/check_getdns_service_sync.h
index e74bb978..e81186c0 100644
--- a/src/test/check_getdns_service_sync.h
+++ b/src/test/check_getdns_service_sync.h
@@ -13,7 +13,7 @@
      {
       /*
        *  context = NULL
-       *  expect: GETDNS_RETURN_BAD_CONTEXT
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;   
        struct getdns_dict *response = NULL;
@@ -27,7 +27,7 @@
      {
       /*
        *  name = NULL
-       *  expect: GETDNS_RETURN_BAD_CONTEXT
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;   
        struct getdns_dict *response = NULL;