r15497@catbus: nickm | 2007-10-02 15:06:31 -0400

 Backport: Move end of "extern C {" block to the end of evdns.h.


svn:r455

2 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 369c432d..5ceee1b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Changes since 1.3e:
+ o Make the entire evdns.h header enclosed in "extern C" as appropriate.
+
 Changes since 1.3d:
  o demote most http warnings to debug messages
  o Fix compilation on Solaris; from Magne Mahre
diff --git a/evdns.h b/evdns.h
index af7962e1..2d029e2d 100644
--- a/evdns.h
+++ b/evdns.h
@@ -313,10 +313,6 @@ void evdns_set_log_fn(evdns_debug_log_fn_type fn);
 
 #define DNS_NO_SEARCH 1
 
-#ifdef __cplusplus
-}
-#endif
-
 /*
  * Structures and functions used to implement a DNS server.
  */
@@ -364,4 +360,8 @@ int evdns_server_request_drop(struct evdns_server_request *req);
 struct sockaddr;
 int evdns_server_request_get_requesting_addr(struct evdns_server_request *_req, struct sockaddr *sa, int addr_len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* !EVENTDNS_H */