From dd3f46fd285fcec95e426a64e6b3995c0a183334 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 24 Feb 2016 01:01:54 +0000 Subject: [PATCH] stpgd: Fix compilation in perf mode Reported-by: TomK git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6815 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- usr/stpgd/Makefile | 9 +-------- usr/stpgd/stpgd_main.c | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/usr/stpgd/Makefile b/usr/stpgd/Makefile index 3fa1e9bc7..fc340742e 100644 --- a/usr/stpgd/Makefile +++ b/usr/stpgd/Makefile @@ -89,14 +89,7 @@ extraclean: clean grep "^CFLAGS += \-DDEBUG -g -fno-inline -fno-inline-functions" Makefile >/dev/null rm Makefile.aa -2perf: - sed -i.aa s/"^C\?FLAGS += \-DEXTRACHECKS"/"#CFLAGS += \-DEXTRACHECKS"/ Makefile - grep "^#CFLAGS += \-DEXTRACHECKS" Makefile >/dev/null - sed -i.aa s/"^C\?FLAGS += \-DTRACING"/"#CFLAGS += \-DTRACING"/ Makefile - grep "^#CFLAGS += \-DTRACING" Makefile >/dev/null - sed -i.aa s/"^C\?FLAGS += \-DDEBUG -g -fno-inline -fno-inline-functions"/"#CFLAGS += \-DDEBUG -g -fno-inline -fno-inline-functions"/ Makefile - grep "^#CFLAGS += \-DDEBUG -g -fno-inline -fno-inline-functions" Makefile >/dev/null - rm Makefile.aa +2perf: 2release release-archive: ../../scripts/generate-release-archive stpgd "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' ../include/version.h)" diff --git a/usr/stpgd/stpgd_main.c b/usr/stpgd/stpgd_main.c index 625879cfc..63fa92bdd 100644 --- a/usr/stpgd/stpgd_main.c +++ b/usr/stpgd/stpgd_main.c @@ -46,12 +46,12 @@ char *app_name; # endif #endif /* DEBUG */ -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) - bool log_daemon = true; unsigned long trace_flag = DEFAULT_LOG_FLAGS; #endif /* defined(DEBUG) || defined(TRACING) */ +#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) + int transition_timeout = DEFAULT_TRANSITION_TIME; static struct option const long_options[] = {