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

SYSLOG: Some rather complex conditional compilation missed a case.

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-21 15:08:09 -06:00
parent 0e1e3bc404
commit 8a9bd9af9d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/syslog/syslog_channel.c
View File

@ -57,7 +57,17 @@
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_ARCH_LOWPUTC #if defined(CONFIG_SYSLOG_SERIAL_CONSOLE) && defined(CONFIG_ARCH_LOWPUTC)
# define HAVE_LOWPUTC
#elif !defined(CONFIG_RAMLOG_SYSLOG)
# define NEED_LOWPUTC
#endif
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
#ifdef NEED_LOWPUTC
static int syslog_default_putc(int ch); static int syslog_default_putc(int ch);
#endif #endif
static int syslog_default_flush(void); static int syslog_default_flush(void);
@ -73,7 +83,7 @@ const struct syslog_channel_s g_default_channel =
ramlog_putc, ramlog_putc,
syslog_default_flush syslog_default_flush
}; };
#elif defined(CONFIG_SYSLOG_SERIAL_CONSOLE) && defined(CONFIG_ARCH_LOWPUTC) #elif defined(HAVE_LOWPUTC)
const struct syslog_channel_s g_default_channel = const struct syslog_channel_s g_default_channel =
{ {
up_putc, up_putc,
@ -105,7 +115,7 @@ FAR const struct syslog_channel_s *g_syslog_channel = &g_default_channel;
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_ARCH_LOWPUTC #ifdef NEED_LOWPUTC
static int syslog_default_putc(int ch) static int syslog_default_putc(int ch)
{ {
return ch; return ch;