Merge branch 'develop' of github.com:verisign/getdns into develop

spec/example-reverse.c

@@ -14,9 +14,10 @@ void this_callbackfn(struct getdns_context *this_context,
                      void *this_userarg,
                      getdns_transaction_t this_transaction_id)
 {
+	getdns_return_t this_ret;  /* Holder for all function returns */
 	UNUSED_PARAM(this_userarg);  /* Not looking at the userarg for this example */
 	UNUSED_PARAM(this_context);  /* Not looking at the context for this example */
-	getdns_return_t this_ret;  /* Holder for all function returns */
+	UNUSED_PARAM(this_ret); /* Set, but not read */
 	if (this_callback_type == GETDNS_CALLBACK_COMPLETE)  /* This is a callback with data */
 	{
 		/* Be sure the search returned something */
@@ -57,7 +58,7 @@ void this_callbackfn(struct getdns_context *this_context,
 
 					struct getdns_bindata * this_dname;
 					this_ret = getdns_dict_get_bindata(this_rdata, "rdata_raw", &this_dname);
-					char *this_dname_str = getdns_convert_dns_name_to_fqdn(this_dname->data);
+					char *this_dname_str = getdns_convert_dns_name_to_fqdn((char *)this_dname->data);
 					printf("The dname is %s\n", this_dname_str);
 					free(this_dname_str);
 

spec/getdns_core_only.h

@@ -1,10 +1,13 @@
-/* Created at 2014-01-20-16-01-49*/
+/* Created at 2014-01-22-10-48-59*/
 #ifndef GETDNS_H
 #define GETDNS_H
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <netinet/in.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define GETDNS_COMPILATION_COMMENT The API implementation should fill in something here, such as a compilation version string and date, and change it each time the API is compiled.
 
@@ -595,4 +598,7 @@ getdns_context_set_extended_memory_functions(
   void                  (*free)(void *userarg, void *ptr)
 );
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* GETDNS_H */

spec/index.html

@@ -2210,7 +2210,7 @@ The response dicts inherit the custom memory management functions and the value
 
 <h1>9. The Generated Files</h1>
 
-<p>There is <a href="getdns-0.376.tgz">a tarball</a> that includes the .h files,
+<p>There is <a href="getdns-0.379.tgz">a tarball</a> that includes the .h files,
 the examples, and so on. The examples all make, even though there is no API implementation, based
 on a pseudo-implementation in the tarball; see make-examples-PLATFORM.sh. Note that this currently builds fine
 on the Macintosh and Ubuntu; help is definitely appreciated on making the build process

src/example/example-reverse.c

@@ -14,9 +14,10 @@ void this_callbackfn(struct getdns_context *this_context,
                      void *this_userarg,
                      getdns_transaction_t this_transaction_id)
 {
+	getdns_return_t this_ret;  /* Holder for all function returns */
 	UNUSED_PARAM(this_userarg);  /* Not looking at the userarg for this example */
 	UNUSED_PARAM(this_context);  /* Not looking at the context for this example */
-	getdns_return_t this_ret;  /* Holder for all function returns */
+	UNUSED_PARAM(this_ret); /* Set, but not read */
 	if (this_callback_type == GETDNS_CALLBACK_COMPLETE)  /* This is a callback with data */
 	{
 		/* Be sure the search returned something */
@@ -57,7 +58,7 @@ void this_callbackfn(struct getdns_context *this_context,
 
 					struct getdns_bindata * this_dname;
 					this_ret = getdns_dict_get_bindata(this_rdata, "rdata_raw", &this_dname);
-					char *this_dname_str = getdns_convert_dns_name_to_fqdn(this_dname->data);
+					char *this_dname_str = getdns_convert_dns_name_to_fqdn((char *)this_dname->data);
 					printf("The dname is %s\n", this_dname_str);
 					free(this_dname_str);
 

src/getdns/getdns.h

@@ -38,7 +38,10 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <netinet/in.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 struct event_base;
 
@@ -884,4 +887,7 @@ getdns_return_t
 getdns_extension_set_libevent_base(struct getdns_context *context,
     struct event_base *this_event_base);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* GETDNS_H */

src/types-internal.h

@@ -37,6 +37,7 @@
 #define TYPES_INTERNAL_H_
 
 #include <getdns/getdns.h>
+#include <netinet/in.h>
 #include <ldns/ldns.h>
 struct getdns_context;