Merged revisions 6596-6674,6679 via svnmerge from

svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk



git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.1.x@6681 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2015-11-12 03:57:17 +00:00
parent ced1efb515
commit 408ae374ba
102 changed files with 1436 additions and 764 deletions
-2
View File
@@ -18,8 +18,6 @@
#
SHELL=/bin/bash
# Decide to use which kernel src. If not specified, is current running kernel.
#export KDIR=/usr/src/linux-2.6
FILEIO_DIR=fileio
STPGD_DIR=stpgd
+2 -1
View File
@@ -65,10 +65,11 @@ char *app_name;
# endif
#endif /* DEBUG */
bool log_daemon = false;
unsigned long trace_flag = DEFAULT_LOG_FLAGS;
#endif /* defined(DEBUG) || defined(TRACING) */
bool log_daemon = false;
#define DEF_BLOCK_SHIFT 9
#define THREADS 7
+2 -1
View File
@@ -82,9 +82,10 @@ extern char *app_name;
#define __LOG_PREFIX NULL
#endif
extern bool log_daemon;
#if defined(DEBUG) || defined(TRACING)
extern bool log_daemon;
extern unsigned long trace_flag;
extern int debug_init(void);