Permalink
Browse files

Rip out c-ares

  • Loading branch information...
1 parent a069956 commit 41b1265af8329131154539cb0d1eda57758b62be @piscisaureus piscisaureus committed Aug 6, 2012
Showing with 6 additions and 29,031 deletions.
  1. +0 −2 LICENSE
  2. +1 −51 Makefile
  3. +2 −6 config-mingw.mk
  4. +3 −11 config-unix.mk
  5. +0 −622 include/ares.h
  6. +0 −24 include/ares_version.h
  7. +0 −37 src/ares/AUTHORS
  8. +0 −7 src/ares/CHANGES
  9. +0 −21 src/ares/NEWS
  10. +0 −60 src/ares/README
  11. +0 −13 src/ares/README.cares
  12. +0 −142 src/ares/README.msvc
  13. +0 −16 src/ares/RELEASE-NOTES
  14. +0 −23 src/ares/TODO
  15. +0 −66 src/ares/ares__close_sockets.c
  16. +0 −264 src/ares/ares__get_hostent.c
  17. +0 −71 src/ares/ares__read_line.c
  18. +0 −111 src/ares/ares__timeval.c
  19. +0 −63 src/ares/ares_cancel.c
  20. +0 −231 src/ares/ares_data.c
  21. +0 −69 src/ares/ares_data.h
  22. +0 −107 src/ares/ares_destroy.c
  23. +0 −103 src/ares/ares_dns.h
  24. +0 −201 src/ares/ares_expand_name.c
  25. +0 −75 src/ares/ares_expand_string.c
  26. +0 −63 src/ares/ares_fds.c
  27. +0 −42 src/ares/ares_free_hostent.c
  28. +0 −25 src/ares/ares_free_string.c
  29. +0 −30 src/ares/ares_getenv.c
  30. +0 −26 src/ares/ares_getenv.h
  31. +0 −301 src/ares/ares_gethostbyaddr.c
  32. +0 −524 src/ares/ares_gethostbyname.c
  33. +0 −427 src/ares/ares_getnameinfo.c
  34. +0 −122 src/ares/ares_getopt.c
  35. +0 −53 src/ares/ares_getopt.h
  36. +0 −72 src/ares/ares_getsock.c
  37. +0 −2,021 src/ares/ares_init.c
  38. +0 −221 src/ares/ares_iphlpapi.h
  39. +0 −78 src/ares/ares_ipv6.h
  40. +0 −142 src/ares/ares_library_init.c
  41. +0 −42 src/ares/ares_library_init.h
  42. +0 −86 src/ares/ares_llist.c
  43. +0 −42 src/ares/ares_llist.h
  44. +0 −195 src/ares/ares_mkquery.c
  45. +0 −249 src/ares/ares_nowarn.c
  46. +0 −61 src/ares/ares_nowarn.h
  47. +0 −248 src/ares/ares_options.c
  48. +0 −263 src/ares/ares_parse_a_reply.c
  49. +0 −261 src/ares/ares_parse_aaaa_reply.c
  50. +0 −170 src/ares/ares_parse_mx_reply.c
  51. +0 −188 src/ares/ares_parse_naptr_reply.c
  52. +0 −182 src/ares/ares_parse_ns_reply.c
  53. +0 −218 src/ares/ares_parse_ptr_reply.c
  54. +0 −135 src/ares/ares_parse_soa_reply.c
  55. +0 −179 src/ares/ares_parse_srv_reply.c
  56. +0 −201 src/ares/ares_parse_txt_reply.c
  57. +0 −11,035 src/ares/ares_platform.c
  58. +0 −43 src/ares/ares_platform.h
  59. +0 −355 src/ares/ares_private.h
  60. +0 −1,294 src/ares/ares_process.c
  61. +0 −183 src/ares/ares_query.c
  62. +0 −144 src/ares/ares_rules.h
  63. +0 −321 src/ares/ares_search.c
  64. +0 −134 src/ares/ares_send.c
  65. +0 −221 src/ares/ares_setup.h
  66. +0 −66 src/ares/ares_strcasecmp.c
  67. +0 −30 src/ares/ares_strcasecmp.h
  68. +0 −42 src/ares/ares_strdup.c
  69. +0 −26 src/ares/ares_strdup.h
  70. +0 −56 src/ares/ares_strerror.c
  71. +0 −81 src/ares/ares_timeout.c
  72. +0 −11 src/ares/ares_version.c
  73. +0 −79 src/ares/ares_writev.c
  74. +0 −36 src/ares/ares_writev.h
  75. +0 −59 src/ares/bitncmp.c
  76. +0 −26 src/ares/bitncmp.h
  77. +0 −512 src/ares/config_cygwin/ares_config.h
  78. +0 −512 src/ares/config_darwin/ares_config.h
  79. +0 −512 src/ares/config_freebsd/ares_config.h
  80. +0 −512 src/ares/config_linux/ares_config.h
  81. +0 −512 src/ares/config_netbsd/ares_config.h
  82. +0 −512 src/ares/config_openbsd/ares_config.h
  83. +0 −512 src/ares/config_sunos/ares_config.h
  84. +0 −369 src/ares/config_win32/ares_config.h
  85. +0 −35 src/ares/get_ver.awk
  86. +0 −451 src/ares/inet_net_pton.c
  87. +0 −31 src/ares/inet_net_pton.h
  88. +0 −208 src/ares/inet_ntop.c
  89. +0 −26 src/ares/inet_ntop.h
  90. +0 −203 src/ares/nameser.h
  91. +0 −512 src/ares/setup_once.h
  92. +0 −22 src/ares/windows_port.c
  93. +0 −85 uv.gyp
View
@@ -33,8 +33,6 @@ The externally maintained libraries used by libuv are:
- ngx_queue.h (from Nginx), copyright Igor Sysoev. Two clause BSD license.
- - c-ares, copyright Daniel Stenberg and others. MIT licensed.
-
- libev, located at ev/ is copyright Marc Alexander Lehmann, and
dual-licensed under the MIT license and GPL2.
View
@@ -24,54 +24,7 @@ ifdef MSVC
uname_S := MINGW
endif
-CPPFLAGS += -Iinclude -Iinclude/uv-private -Isrc/ares
-
-CARES_OBJS =
-CARES_OBJS += src/ares/ares__close_sockets.o
-CARES_OBJS += src/ares/ares__get_hostent.o
-CARES_OBJS += src/ares/ares__read_line.o
-CARES_OBJS += src/ares/ares__timeval.o
-CARES_OBJS += src/ares/ares_cancel.o
-CARES_OBJS += src/ares/ares_data.o
-CARES_OBJS += src/ares/ares_destroy.o
-CARES_OBJS += src/ares/ares_expand_name.o
-CARES_OBJS += src/ares/ares_expand_string.o
-CARES_OBJS += src/ares/ares_fds.o
-CARES_OBJS += src/ares/ares_free_hostent.o
-CARES_OBJS += src/ares/ares_free_string.o
-CARES_OBJS += src/ares/ares_gethostbyaddr.o
-CARES_OBJS += src/ares/ares_gethostbyname.o
-CARES_OBJS += src/ares/ares_getnameinfo.o
-CARES_OBJS += src/ares/ares_getopt.o
-CARES_OBJS += src/ares/ares_getsock.o
-CARES_OBJS += src/ares/ares_init.o
-CARES_OBJS += src/ares/ares_library_init.o
-CARES_OBJS += src/ares/ares_llist.o
-CARES_OBJS += src/ares/ares_mkquery.o
-CARES_OBJS += src/ares/ares_nowarn.o
-CARES_OBJS += src/ares/ares_options.o
-CARES_OBJS += src/ares/ares_parse_a_reply.o
-CARES_OBJS += src/ares/ares_parse_aaaa_reply.o
-CARES_OBJS += src/ares/ares_parse_mx_reply.o
-CARES_OBJS += src/ares/ares_parse_naptr_reply.o
-CARES_OBJS += src/ares/ares_parse_ns_reply.o
-CARES_OBJS += src/ares/ares_parse_ptr_reply.o
-CARES_OBJS += src/ares/ares_parse_soa_reply.o
-CARES_OBJS += src/ares/ares_parse_srv_reply.o
-CARES_OBJS += src/ares/ares_parse_txt_reply.o
-CARES_OBJS += src/ares/ares_process.o
-CARES_OBJS += src/ares/ares_query.o
-CARES_OBJS += src/ares/ares_search.o
-CARES_OBJS += src/ares/ares_send.o
-CARES_OBJS += src/ares/ares_strcasecmp.o
-CARES_OBJS += src/ares/ares_strdup.o
-CARES_OBJS += src/ares/ares_strerror.o
-CARES_OBJS += src/ares/ares_timeout.o
-CARES_OBJS += src/ares/ares_version.o
-CARES_OBJS += src/ares/ares_writev.o
-CARES_OBJS += src/ares/bitncmp.o
-CARES_OBJS += src/ares/inet_net_pton.o
-CARES_OBJS += src/ares/inet_ntop.o
+CPPFLAGS += -Iinclude -Iinclude/uv-private
ifneq (,$(findstring MINGW,$(uname_S)))
include config-mingw.mk
@@ -84,9 +37,6 @@ BENCHMARKS=test/blackhole-server.c test/echo-server.c test/dns-server.c test/ben
all: uv.a
-$(CARES_OBJS): %.o: %.c
- $(CC) -o $*.o -c $(CFLAGS) $(CPPFLAGS) $< -DHAVE_CONFIG_H
-
test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) uv.a
$(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-tests test/run-tests.c \
test/runner.c $(RUNNER_SRC) $(TESTS) uv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
View
@@ -24,11 +24,9 @@ CC = $(PREFIX)gcc
AR = $(PREFIX)ar
E=.exe
-CFLAGS=$(CPPFLAGS) -g --std=gnu89 -D_WIN32_WINNT=0x0600 -Isrc/ares/config_win32
+CFLAGS=$(CPPFLAGS) -g --std=gnu89 -D_WIN32_WINNT=0x0600
LINKFLAGS=-lm
-CARES_OBJS += src/ares/windows_port.o
-CARES_OBJS += src/ares/ares_platform.o
WIN_SRCS=$(wildcard src/win/*.c)
WIN_OBJS=$(WIN_SRCS:.c=.o)
@@ -37,7 +35,7 @@ RUNNER_LINKFLAGS=$(LINKFLAGS)
RUNNER_LIBS=-lws2_32 -lpsapi -liphlpapi
RUNNER_SRC=test/runner-win.c
-uv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o $(CARES_OBJS)
+uv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o
$(AR) rcs uv.a $^
src/%.o: src/%.c include/uv.h include/uv-private/uv-win.h
@@ -47,9 +45,7 @@ src/win/%.o: src/win/%.c include/uv.h include/uv-private/uv-win.h src/win/intern
$(CC) $(CFLAGS) -o $@ -c $<
clean-platform:
- -rm -f src/ares/*.o
-rm -f src/win/*.o
distclean-platform:
- -rm -f src/ares/*.o
-rm -f src/win/*.o
View
@@ -47,15 +47,15 @@ OBJS += src/unix/udp.o
ifeq (SunOS,$(uname_S))
EV_CONFIG=config_sunos.h
EIO_CONFIG=config_sunos.h
-CPPFLAGS += -Isrc/ares/config_sunos -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
+CPPFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
LINKFLAGS+=-lsocket -lnsl -lkstat
OBJS += src/unix/sunos.o
endif
ifeq (Darwin,$(uname_S))
EV_CONFIG=config_darwin.h
EIO_CONFIG=config_darwin.h
-CPPFLAGS += -D_DARWIN_USE_64_BIT_INODE=1 -Isrc/ares/config_darwin
+CPPFLAGS += -D_DARWIN_USE_64_BIT_INODE=1
LINKFLAGS+=-framework CoreServices
OBJS += src/unix/darwin.o
OBJS += src/unix/kqueue.o
@@ -65,7 +65,6 @@ ifeq (Linux,$(uname_S))
EV_CONFIG=config_linux.h
EIO_CONFIG=config_linux.h
CSTDFLAG += -D_GNU_SOURCE
-CPPFLAGS += -Isrc/ares/config_linux
LINKFLAGS+=-ldl -lrt
OBJS += src/unix/linux/linux-core.o \
src/unix/linux/inotify.o \
@@ -75,7 +74,6 @@ endif
ifeq (FreeBSD,$(uname_S))
EV_CONFIG=config_freebsd.h
EIO_CONFIG=config_freebsd.h
-CPPFLAGS += -Isrc/ares/config_freebsd
LINKFLAGS+=-lkvm
OBJS += src/unix/freebsd.o
OBJS += src/unix/kqueue.o
@@ -84,7 +82,6 @@ endif
ifeq (DragonFly,$(uname_S))
EV_CONFIG=config_freebsd.h
EIO_CONFIG=config_freebsd.h
-CPPFLAGS += -Isrc/ares/config_freebsd
LINKFLAGS+=
OBJS += src/unix/freebsd.o
OBJS += src/unix/kqueue.o
@@ -93,7 +90,6 @@ endif
ifeq (NetBSD,$(uname_S))
EV_CONFIG=config_netbsd.h
EIO_CONFIG=config_netbsd.h
-CPPFLAGS += -Isrc/ares/config_netbsd
LINKFLAGS+=
OBJS += src/unix/netbsd.o
OBJS += src/unix/kqueue.o
@@ -102,7 +98,6 @@ endif
ifeq (OpenBSD,$(uname_S))
EV_CONFIG=config_openbsd.h
EIO_CONFIG=config_openbsd.h
-CPPFLAGS += -Isrc/ares/config_openbsd
LINKFLAGS+=-lkvm
OBJS += src/unix/openbsd.o
OBJS += src/unix/kqueue.o
@@ -113,7 +108,6 @@ EV_CONFIG=config_cygwin.h
EIO_CONFIG=config_cygwin.h
# We drop the --std=c89, it hides CLOCK_MONOTONIC on cygwin
CSTDFLAG = -D_GNU_SOURCE
-CPPFLAGS += -Isrc/ares/config_cygwin
LINKFLAGS+=
OBJS += src/unix/cygwin.o
endif
@@ -131,7 +125,7 @@ endif
RUNNER_LIBS=
RUNNER_SRC=test/runner-unix.c
-uv.a: $(OBJS) src/fs-poll.o src/inet.o src/uv-common.o src/unix/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o $(CARES_OBJS)
+uv.a: $(OBJS) src/fs-poll.o src/inet.o src/uv-common.o src/unix/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o
$(AR) rcs uv.a $^
src/%.o: src/%.c include/uv.h include/uv-private/uv-unix.h
@@ -157,15 +151,13 @@ src/unix/uv-eio.o: src/unix/uv-eio.c
clean-platform:
- -rm -f src/ares/*.o
-rm -f src/unix/*.o
-rm -f src/unix/ev/*.o
-rm -f src/unix/eio/*.o
-rm -f src/unix/linux/*.o
-rm -rf test/run-tests.dSYM run-benchmarks.dSYM
distclean-platform:
- -rm -f src/ares/*.o
-rm -f src/unix/*.o
-rm -f src/unix/ev/*.o
-rm -f src/unix/eio/*.o
Oops, something went wrong.

0 comments on commit 41b1265

Please sign in to comment.