From 3e41db8de993ad459e13ca03cc22eae562741672 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 27 Oct 2014 18:11:56 -0600 Subject: [PATCH] More compile fixes --- interpreters/bas/Makefile | 10 +++------- interpreters/bas/global.c | 2 +- interpreters/bas/statement.c | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/interpreters/bas/Makefile b/interpreters/bas/Makefile index cd43c67e3..74cde67fd 100644 --- a/interpreters/bas/Makefile +++ b/interpreters/bas/Makefile @@ -44,7 +44,9 @@ CSRCS = ifeq ($(CONFIG_INTERPRETERS_BAS),y) -CSRCS += auto.c bas.c fs.c getopt1.c getopt.c global.c main.c program.c statement.c str.c value.c var.c +CSRCS += auto.c bas.c fs.c getopt1.c getopt.c global.c main.c program.c +CSRCS += str.c value.c var.c + DEPPATH = --dep-path . VPATH = . @@ -52,12 +54,6 @@ ifeq ($(WINTOOL),y) INCDIROPT = -w endif -##include ascii/Make.defs -##include functions/Make.defs -##include nuttx/Make.defs -##include rtu/Make.defs -##include tcp/Make.defs - endif AOBJS = $(ASRCS:.S=$(OBJEXT)) diff --git a/interpreters/bas/global.c b/interpreters/bas/global.c index 243b7c1eb..1b737332e 100644 --- a/interpreters/bas/global.c +++ b/interpreters/bas/global.c @@ -39,7 +39,7 @@ #endif /*}}}*/ -#ifndef CONFIG_INTERPRETER_BAS_HAVE_ENVIRON +#ifdef CONFIG_INTERPRETER_BAS_HAVE_ENVIRON extern char **environ; #endif diff --git a/interpreters/bas/statement.c b/interpreters/bas/statement.c index 9e324b885..36f22d057 100644 --- a/interpreters/bas/statement.c +++ b/interpreters/bas/statement.c @@ -1,8 +1,8 @@ /* #includes */ /*{{{C}}}*//*{{{*/ +#include #include #include "config.h" -#include #ifdef HAVE_GETTEXT #include #define _(String) gettext(String)