91 lines
2.9 KiB
Diff
91 lines
2.9 KiB
Diff
diff -u -r /home/fornwall/termux/c-ares/src/ares.h ./ares.h
|
|
--- /home/fornwall/termux/c-ares/src/ares.h 2013-04-08 16:16:48.000000000 -0400
|
|
+++ ./ares.h 2014-09-24 17:46:41.000000000 -0400
|
|
@@ -19,8 +19,6 @@
|
|
#define ARES__H
|
|
|
|
#include "ares_version.h" /* c-ares version defines */
|
|
-#include "ares_build.h" /* c-ares build definitions */
|
|
-#include "ares_rules.h" /* c-ares rules enforcement */
|
|
|
|
/*
|
|
* Define WIN32 when build target is Win32 API
|
|
@@ -31,6 +29,56 @@
|
|
# define WIN32
|
|
#endif
|
|
|
|
+/*************************** libuv patch ***************/
|
|
+
|
|
+/*
|
|
+ * We want to avoid autoconf altogether since there are a finite number of
|
|
+ * operating systems and simply build c-ares. Therefore we do not want the
|
|
+ * configurations provided by ares_build.h since we are always statically
|
|
+ * linking c-ares into libuv. Having a system dependent ares_build.h forces
|
|
+ * all users of ares.h to include the correct ares_build.h. We do not care
|
|
+ * about the linking checks provided by ares_rules.h. This would complicate
|
|
+ * the libuv build process.
|
|
+ */
|
|
+
|
|
+
|
|
+#if defined(WIN32)
|
|
+/* Configure process defines this to 1 when it finds out that system */
|
|
+/* header file ws2tcpip.h must be included by the external interface. */
|
|
+/* #undef CARES_PULL_WS2TCPIP_H */
|
|
+# include <winsock2.h>
|
|
+# include <ws2tcpip.h>
|
|
+# include <windows.h>
|
|
+
|
|
+#else /* Not Windows */
|
|
+
|
|
+# include <sys/time.h>
|
|
+# include <sys/types.h>
|
|
+# include <sys/socket.h>
|
|
+#endif
|
|
+
|
|
+#if 0
|
|
+/* The size of `long', as computed by sizeof. */
|
|
+#define CARES_SIZEOF_LONG 4
|
|
+#endif
|
|
+
|
|
+/* Integral data type used for ares_socklen_t. */
|
|
+#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
|
|
+
|
|
+#if 0
|
|
+/* The size of `ares_socklen_t', as computed by sizeof. */
|
|
+#define CARES_SIZEOF_ARES_SOCKLEN_T 4
|
|
+#endif
|
|
+
|
|
+/* Data type definition of ares_socklen_t. */
|
|
+typedef int ares_socklen_t;
|
|
+
|
|
+#if 0 /* libuv disabled */
|
|
+#include "ares_rules.h" /* c-ares rules enforcement */
|
|
+#endif
|
|
+
|
|
+/*********************** end libuv patch ***************/
|
|
+
|
|
#include <sys/types.h>
|
|
|
|
/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
|
|
@@ -472,6 +520,8 @@
|
|
struct ares_txt_reply *next;
|
|
unsigned char *txt;
|
|
size_t length; /* length excludes null termination */
|
|
+ unsigned char record_start; /* 1 - if start of new record
|
|
+ * 0 - if a chunk in the same record */
|
|
};
|
|
|
|
struct ares_naptr_reply {
|
|
diff -u -r /home/fornwall/termux/c-ares/src/ares_version.h ./ares_version.h
|
|
--- /home/fornwall/termux/c-ares/src/ares_version.h 2013-05-12 09:40:32.000000000 -0400
|
|
+++ ./ares_version.h 2014-09-24 17:46:41.000000000 -0400
|
|
@@ -11,7 +11,7 @@
|
|
#define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
|
|
(ARES_VERSION_MINOR<<8)|\
|
|
(ARES_VERSION_PATCH))
|
|
-#define ARES_VERSION_STR "1.10.0"
|
|
+#define ARES_VERSION_STR "1.10.0-DEV"
|
|
|
|
#if (ARES_VERSION >= 0x010700)
|
|
# define CARES_HAVE_ARES_LIBRARY_INIT 1
|