r15496@catbus: nickm | 2007-10-02 15:06:22 -0400

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

svn:r456

diff --git a/ChangeLog b/ChangeLog
index e57f32fac9d058840276688825f4411ca52607ae..96880842f8ec1d728a4fa38030bd83e90454556d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,4 +24,5 @@ Changes in current version:
  o Skip calling gettime() in timeout_process if we are not in fact waiting for any events. (Patch from Trond Norbye)
  o Make test subdirectory compile under mingw.
  o Fix win32 buffer.c behavior so that it is correct for sockets (which do not like ReadFile and WriteFile).
-
+ o Make the test.sh script run unit tests for the evpoll method.
+ o Make the entire evdns.h header enclosed in "extern C" as appropriate.
\ No newline at end of file

diff --git a/evdns.h b/evdns.h
index b01b6ebc096ac7dbc5f55465648a030ea7b28481..6ec1834e381733b23d4be8ad4ae5b7e82f9ca34d 100644 (file)
--- a/evdns.h
+++ b/evdns.h
@@ -465,10 +465,6 @@ void evdns_set_transaction_id_fn(uint16_t (*fn)(void));
 
 #define DNS_NO_SEARCH 1
 
-#ifdef __cplusplus
-}
-#endif
-
 /*
  * Structures and functions used to implement a DNS server.
  */
@@ -516,4 +512,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 */