diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-02-07 10:56:24 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-02-07 10:56:24 -0600 |
| commit | 2d58f3726de7ce54cdeee8ae35c80fc7aae7e931 (patch) | |
| tree | 91324058ce1edfc59ed84efbaaa54f3810316b46 /apps | |
| parent | bcde5f18638e9f9bea835f63736514791643e257 (diff) | |
| download | nuttx-2d58f3726de7ce54cdeee8ae35c80fc7aae7e931.tar.gz nuttx-2d58f3726de7ce54cdeee8ae35c80fc7aae7e931.tar.bz2 nuttx-2d58f3726de7ce54cdeee8ae35c80fc7aae7e931.zip | |
More changes for a correct NSH Windows natvie build
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Make.defs | 11 | ||||
| -rw-r--r-- | apps/nshlib/nsh_parse.c | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/apps/Make.defs b/apps/Make.defs index f7e6aa08d..bdc36e748 100644 --- a/apps/Make.defs +++ b/apps/Make.defs @@ -2,7 +2,7 @@ # apps/Make.defs # Common make definitions provided to all applications # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,9 +42,18 @@ else DEPCONFIG = $(TOPDIR)$(DELIM).config $(APPDIR)$(DELIM).config endif +ifeq ($(CONFIG_WINDOWS_NATIVE),y) +define REGISTER + $(Q) echo Register: $1 + $(Q) echo { "$1", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat" + $(Q) echo int $4(int argc, char *argv[]); > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat" + $(Q) touch $(BUILTIN_REGISTRY)$(DELIM).updated" +endef +else define REGISTER $(Q) echo "Register: $1" $(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat" $(Q) echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat" $(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated" endef +endif diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c index 9641cd416..45e3b8508 100644 --- a/apps/nshlib/nsh_parse.c +++ b/apps/nshlib/nsh_parse.c @@ -1168,7 +1168,11 @@ static FAR char *nsh_argexpand(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline, argument = nsh_strcat(vtbl, argument, envstr); *allocation = argument; } + else #endif + { + /* Just to catch any dangling else clauses */ + } } } |