sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More changes for a correct NSH Windows natvie build

Browse Source
This commit is contained in:
Gregory Nutt 2014-02-07 10:56:24 -06:00
parent 980bd93afc
commit c4c49ffbb3
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Make.defs
View File

@ -2,7 +2,7 @@
# apps/Make.defs # apps/Make.defs
# Common make definitions provided to all applications # 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> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -42,9 +42,18 @@ else
DEPCONFIG = $(TOPDIR)$(DELIM).config $(APPDIR)$(DELIM).config DEPCONFIG = $(TOPDIR)$(DELIM).config $(APPDIR)$(DELIM).config
endif 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 define REGISTER
$(Q) echo "Register: $1" $(Q) echo "Register: $1"
$(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat" $(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) echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat"
$(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated" $(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated"
endef endef
endif

4
nshlib/nsh_parse.c
View File

@ -1168,7 +1168,11 @@ static FAR char *nsh_argexpand(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline,
argument = nsh_strcat(vtbl, argument, envstr); argument = nsh_strcat(vtbl, argument, envstr);
*allocation = argument; *allocation = argument;
} }
else
#endif #endif
{
/* Just to catch any dangling else clauses */
}
} }
} }