[git commit nptl] libc/inet: set path to resolver file via CPP

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Sun Jan 24 05:32:10 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=8df555e6f7c3f27c07ef0f45759b7f5a38fe67f9
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

No objcode changes.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/inet/Makefile.in          |    1 +
 libc/inet/_res_state.c         |    2 +-
 libc/inet/closenameservers.c   |    2 +-
 libc/inet/decodea.c            |    2 +-
 libc/inet/decoded.c            |    2 +-
 libc/inet/decodeh.c            |    2 +-
 libc/inet/decodep.c            |    2 +-
 libc/inet/decodeq.c            |    2 +-
 libc/inet/dnslookup.c          |    2 +-
 libc/inet/encodea.c            |    2 +-
 libc/inet/encoded.c            |    2 +-
 libc/inet/encodeh.c            |    2 +-
 libc/inet/encodep.c            |    2 +-
 libc/inet/encodeq.c            |    2 +-
 libc/inet/formquery.c          |    2 +-
 libc/inet/get_hosts_byaddr_r.c |    2 +-
 libc/inet/get_hosts_byname_r.c |    2 +-
 libc/inet/gethostbyaddr.c      |    2 +-
 libc/inet/gethostbyaddr_r.c    |    2 +-
 libc/inet/gethostbyname.c      |    2 +-
 libc/inet/gethostbyname2.c     |    2 +-
 libc/inet/gethostbyname2_r.c   |    2 +-
 libc/inet/gethostbyname_r.c    |    2 +-
 libc/inet/gethostent.c         |    2 +-
 libc/inet/gethostent_r.c       |    2 +-
 libc/inet/getnameinfo.c        |    2 +-
 libc/inet/lengthd.c            |    2 +-
 libc/inet/lengthq.c            |    2 +-
 libc/inet/ns_name.c            |    2 +-
 libc/inet/opennameservers.c    |    2 +-
 libc/inet/read_etc_hosts_r.c   |    2 +-
 libc/inet/res_comp.c           |    2 +-
 libc/inet/res_init.c           |    2 +-
 libc/inet/res_query.c          |    2 +-
 34 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/libc/inet/Makefile.in b/libc/inet/Makefile.in
index a91d37f..702642f 100644
--- a/libc/inet/Makefile.in
+++ b/libc/inet/Makefile.in
@@ -12,6 +12,7 @@ include $(top_srcdir)libc/inet/rpc/Makefile.in
 INET_DIR := $(top_srcdir)libc/inet
 INET_OUT := $(top_builddir)libc/inet
 
+CFLAGS-inet := -DRESOLVER="\"resolv.c\""
 CSRC-y :=
 # des uses ntohl
 CSRC-$(findstring y,$(UCLIBC_HAS_CRYPT_IMPL)$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6)) += ntohl.c
diff --git a/libc/inet/_res_state.c b/libc/inet/_res_state.c
index 8ca4ac1..dc0d89f 100644
--- a/libc/inet/_res_state.c
+++ b/libc/inet/_res_state.c
@@ -5,4 +5,4 @@
  */
 
 #define L_res_state
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/closenameservers.c b/libc/inet/closenameservers.c
index ca4dae3..65889a7 100644
--- a/libc/inet/closenameservers.c
+++ b/libc/inet/closenameservers.c
@@ -5,4 +5,4 @@
  */
 
 #define L_closenameservers
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/decodea.c b/libc/inet/decodea.c
index 409a978..112d5d9 100644
--- a/libc/inet/decodea.c
+++ b/libc/inet/decodea.c
@@ -5,4 +5,4 @@
  */
 
 #define L_decodea
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/decoded.c b/libc/inet/decoded.c
index 73849ef..378cbfa 100644
--- a/libc/inet/decoded.c
+++ b/libc/inet/decoded.c
@@ -5,4 +5,4 @@
  */
 
 #define L_decoded
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/decodeh.c b/libc/inet/decodeh.c
index 86681fa..7744287 100644
--- a/libc/inet/decodeh.c
+++ b/libc/inet/decodeh.c
@@ -5,4 +5,4 @@
  */
 
 #define L_decodeh
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/decodep.c b/libc/inet/decodep.c
index 40b0bda..0e946e0 100644
--- a/libc/inet/decodep.c
+++ b/libc/inet/decodep.c
@@ -5,4 +5,4 @@
  */
 
 #define L_decodep
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/decodeq.c b/libc/inet/decodeq.c
index a610967..9e36b95 100644
--- a/libc/inet/decodeq.c
+++ b/libc/inet/decodeq.c
@@ -5,4 +5,4 @@
  */
 
 #define L_decodeq
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/dnslookup.c b/libc/inet/dnslookup.c
index 4ffc34f..b9f59a2 100644
--- a/libc/inet/dnslookup.c
+++ b/libc/inet/dnslookup.c
@@ -5,4 +5,4 @@
  */
 
 #define L_dnslookup
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/encodea.c b/libc/inet/encodea.c
index 628f9ba..b42ee4a 100644
--- a/libc/inet/encodea.c
+++ b/libc/inet/encodea.c
@@ -5,4 +5,4 @@
  */
 
 #define L_encodea
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/encoded.c b/libc/inet/encoded.c
index d606187..27f92be 100644
--- a/libc/inet/encoded.c
+++ b/libc/inet/encoded.c
@@ -5,4 +5,4 @@
  */
 
 #define L_encoded
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/encodeh.c b/libc/inet/encodeh.c
index 1d54880..6a69a94 100644
--- a/libc/inet/encodeh.c
+++ b/libc/inet/encodeh.c
@@ -5,4 +5,4 @@
  */
 
 #define L_encodeh
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/encodep.c b/libc/inet/encodep.c
index d2f248b..d298c21 100644
--- a/libc/inet/encodep.c
+++ b/libc/inet/encodep.c
@@ -5,4 +5,4 @@
  */
 
 #define L_encodep
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/encodeq.c b/libc/inet/encodeq.c
index be1a312..5555aa5 100644
--- a/libc/inet/encodeq.c
+++ b/libc/inet/encodeq.c
@@ -5,4 +5,4 @@
  */
 
 #define L_encodeq
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/formquery.c b/libc/inet/formquery.c
index 2c53e33..4bc0ebe 100644
--- a/libc/inet/formquery.c
+++ b/libc/inet/formquery.c
@@ -5,4 +5,4 @@
  */
 
 #define L_formquery
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/get_hosts_byaddr_r.c b/libc/inet/get_hosts_byaddr_r.c
index c377aec..eeac890 100644
--- a/libc/inet/get_hosts_byaddr_r.c
+++ b/libc/inet/get_hosts_byaddr_r.c
@@ -5,4 +5,4 @@
  */
 
 #define L_get_hosts_byaddr_r
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/get_hosts_byname_r.c b/libc/inet/get_hosts_byname_r.c
index 7ad1e3f..caad0bc 100644
--- a/libc/inet/get_hosts_byname_r.c
+++ b/libc/inet/get_hosts_byname_r.c
@@ -5,4 +5,4 @@
  */
 
 #define L_get_hosts_byname_r
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/gethostbyaddr.c b/libc/inet/gethostbyaddr.c
index ae8a543..dc16dd9 100644
--- a/libc/inet/gethostbyaddr.c
+++ b/libc/inet/gethostbyaddr.c
@@ -5,4 +5,4 @@
  */
 
 #define L_gethostbyaddr
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/gethostbyaddr_r.c b/libc/inet/gethostbyaddr_r.c
index 6235c82..6e27e62 100644
--- a/libc/inet/gethostbyaddr_r.c
+++ b/libc/inet/gethostbyaddr_r.c
@@ -5,4 +5,4 @@
  */
 
 #define L_gethostbyaddr_r
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/gethostbyname.c b/libc/inet/gethostbyname.c
index 3d46ab0..9c9e9ca 100644
--- a/libc/inet/gethostbyname.c
+++ b/libc/inet/gethostbyname.c
@@ -5,4 +5,4 @@
  */
 
 #define L_gethostbyname
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/gethostbyname2.c b/libc/inet/gethostbyname2.c
index 6858016..5b9e74b 100644
--- a/libc/inet/gethostbyname2.c
+++ b/libc/inet/gethostbyname2.c
@@ -5,4 +5,4 @@
  */
 
 #define L_gethostbyname2
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/gethostbyname2_r.c b/libc/inet/gethostbyname2_r.c
index 06d058a..0de0dd5 100644
--- a/libc/inet/gethostbyname2_r.c
+++ b/libc/inet/gethostbyname2_r.c
@@ -5,4 +5,4 @@
  */
 
 #define L_gethostbyname2_r
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/gethostbyname_r.c b/libc/inet/gethostbyname_r.c
index fc9e56d..4b34f8d 100644
--- a/libc/inet/gethostbyname_r.c
+++ b/libc/inet/gethostbyname_r.c
@@ -5,4 +5,4 @@
  */
 
 #define L_gethostbyname_r
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/gethostent.c b/libc/inet/gethostent.c
index 16133c0..64c1831 100644
--- a/libc/inet/gethostent.c
+++ b/libc/inet/gethostent.c
@@ -5,4 +5,4 @@
  */
 
 #define L_gethostent
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/gethostent_r.c b/libc/inet/gethostent_r.c
index aeade15..48225d7 100644
--- a/libc/inet/gethostent_r.c
+++ b/libc/inet/gethostent_r.c
@@ -5,4 +5,4 @@
  */
 
 #define L_gethostent_r
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/getnameinfo.c b/libc/inet/getnameinfo.c
index fbfd3ed..86edc51 100644
--- a/libc/inet/getnameinfo.c
+++ b/libc/inet/getnameinfo.c
@@ -5,4 +5,4 @@
  */
 
 #define L_getnameinfo
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/lengthd.c b/libc/inet/lengthd.c
index 07c7fc6..d2db685 100644
--- a/libc/inet/lengthd.c
+++ b/libc/inet/lengthd.c
@@ -5,4 +5,4 @@
  */
 
 #define L_lengthd
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/lengthq.c b/libc/inet/lengthq.c
index e62e6f2..beeafc1 100644
--- a/libc/inet/lengthq.c
+++ b/libc/inet/lengthq.c
@@ -5,4 +5,4 @@
  */
 
 #define L_lengthq
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/ns_name.c b/libc/inet/ns_name.c
index 158a1a3..9df9464 100644
--- a/libc/inet/ns_name.c
+++ b/libc/inet/ns_name.c
@@ -5,4 +5,4 @@
  */
 
 #define L_ns_name
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/opennameservers.c b/libc/inet/opennameservers.c
index effd108..576c8ca 100644
--- a/libc/inet/opennameservers.c
+++ b/libc/inet/opennameservers.c
@@ -5,4 +5,4 @@
  */
 
 #define L_opennameservers
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/read_etc_hosts_r.c b/libc/inet/read_etc_hosts_r.c
index 6504e54..1ec74a5 100644
--- a/libc/inet/read_etc_hosts_r.c
+++ b/libc/inet/read_etc_hosts_r.c
@@ -5,4 +5,4 @@
  */
 
 #define L_read_etc_hosts_r
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/res_comp.c b/libc/inet/res_comp.c
index 8aee6b1..51ea4f2 100644
--- a/libc/inet/res_comp.c
+++ b/libc/inet/res_comp.c
@@ -5,4 +5,4 @@
  */
 
 #define L_res_comp
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/res_init.c b/libc/inet/res_init.c
index 09caf49..b1a1757 100644
--- a/libc/inet/res_init.c
+++ b/libc/inet/res_init.c
@@ -5,4 +5,4 @@
  */
 
 #define L_res_init
-#include "resolv.c"
+#include RESOLVER
diff --git a/libc/inet/res_query.c b/libc/inet/res_query.c
index c662510..f3e569f 100644
--- a/libc/inet/res_query.c
+++ b/libc/inet/res_query.c
@@ -5,4 +5,4 @@
  */
 
 #define L_res_query
-#include "resolv.c"
+#include RESOLVER
-- 
1.6.3.3



More information about the uClibc-cvs mailing list