From 9129fb715b69c0d2ffec2f963f57346bf89bc355 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 15 Nov 2012 19:35:15 +0000 Subject: [PATCH] Fix a place that had a '\' but needed a '/' git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5359 42af7a65-404d-4744-a932-0658087f49c3 --- apps/Makefile | 8 +++++++- apps/netutils/resolv/resolv.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/Makefile b/apps/Makefile index 77f2012ef8..c172135eca 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -102,9 +102,15 @@ endif # Create the list of available applications (INSTALLED_APPS) +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ADD_BUILTIN -INSTALLED_APPS += $(if $(wildcard $1\Makefile),$1,) + INSTALLED_APPS += $(if $(wildcard $1\Makefile),$1,) endef +else +define ADD_BUILTIN + INSTALLED_APPS += $(if $(wildcard $1/Makefile),$1,) +endef +endif $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN)))) diff --git a/apps/netutils/resolv/resolv.c b/apps/netutils/resolv/resolv.c index 346cbe175f..627c40aec9 100644 --- a/apps/netutils/resolv/resolv.c +++ b/apps/netutils/resolv/resolv.c @@ -250,6 +250,7 @@ static int send_query_socket(int sockfd, const char *name, struct sockaddr_in *a return sendto(sockfd, buffer, query + 5 - buffer, 0, (struct sockaddr*)addr, ADDRLEN); } +#if 0 /* Not used */ #ifdef CONFIG_NET_IPv6 static int send_query(const char *name, struct sockaddr_in6 *addr) #else @@ -258,6 +259,7 @@ static int send_query(const char *name, struct sockaddr_in *addr) { return send_query_socket(g_sockfd, name, addr); } +#endif /* Called when new UDP data arrives */