summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-15 19:35:15 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-15 19:35:15 +0000
commitb7ce758f3b0bf5680cc545134a3939bdec40dabf (patch)
treeb682c24fbe73341c60b9a0929456c6b08cb3497a /apps
parent112ae373997ee3b598cc24885f5229d8843e1eea (diff)
downloadnuttx-b7ce758f3b0bf5680cc545134a3939bdec40dabf.tar.gz
nuttx-b7ce758f3b0bf5680cc545134a3939bdec40dabf.tar.bz2
nuttx-b7ce758f3b0bf5680cc545134a3939bdec40dabf.zip
Fix a place that had a '\' but needed a '/'
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5359 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
-rw-r--r--apps/Makefile8
-rw-r--r--apps/netutils/resolv/resolv.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 77f2012ef..c172135ec 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 346cbe175..627c40aec 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 */