Revert the hack of copying the ares.h header distributed with c-ares to...

Revert the hack of copying the ares.h header distributed with c-ares to cares.h. Our ares.pyx's channel class doesn't need to be public.

CHANGES.rst

@@ -82,6 +82,10 @@ Build Changes
   greenlet. See :pr:`1024`.
 
 
+- The Cython ares 'channel' class is no longer declared to be publicly
+  accessible from a named C structure. Doing so caused a conflict with
+  the c-ares header files.
+
 Other Changes
 -------------
 

deps/README.rst

-When updating c-ares, remember to copy ares.h to cares.h.
-
-The original ares.h conflicts with the ares.h generated automatically
-by cython for src/gevent/ares.pyx.

src/gevent/ares.pyx

@@ -250,7 +250,7 @@ cdef void gevent_ares_nameinfo_callback(void *arg, int status, int timeouts, cha
         channel.loop.handle_error(callback, *sys.exc_info())
 
 
-cdef public class channel [object PyGeventAresChannelObject, type PyGeventAresChannel_Type]:
+cdef class channel:
 
     cdef public object loop
     cdef ares_channeldata* channel

src/gevent/cares.pxd

-cdef extern from "cares.h":
+cdef extern from "ares.h":
     struct ares_options:
         int flags
         void* sock_state_cb

src/gevent/dnshelper.c

@@ -8,7 +8,7 @@
 #include <netdb.h>
 #endif
 
-#include "cares.h"
+#include "ares.h"
 
 #include "cares_ntop.h"
 #include "cares_pton.h"