projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.0' into collectd-4.1
[collectd.git]
/
src
/
serial.c
diff --git
a/src/serial.c
b/src/serial.c
index
dd063bb
..
9cfe1dd
100644
(file)
--- a/
src/serial.c
+++ b/
src/serial.c
@@
-25,13
+25,10
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#if defined(KERNEL_LINUX)
-# define SERIAL_HAVE_READ 1
-#else
-# define SERIAL_HAVE_READ 0
+#if !KERNEL_LINUX
+# error "No applicable input method."
#endif
#endif
-#if SERIAL_HAVE_READ
static void serial_submit (const char *type_instance,
counter_t rx, counter_t tx)
{
static void serial_submit (const char *type_instance,
counter_t rx, counter_t tx)
{
@@
-54,7
+51,6
@@
static void serial_submit (const char *type_instance,
static int serial_read (void)
{
static int serial_read (void)
{
-#ifdef KERNEL_LINUX
FILE *fh;
char buffer[1024];
FILE *fh;
char buffer[1024];
@@
-121,13
+117,9
@@
static int serial_read (void)
fclose (fh);
return (0);
fclose (fh);
return (0);
-#endif /* KERNEL_LINUX */
} /* int serial_read */
} /* int serial_read */
-#endif /* SERIAL_HAVE_READ */
void module_register (void)
{
void module_register (void)
{
-#if SERIAL_HAVE_READ
plugin_register_read ("serial", serial_read);
plugin_register_read ("serial", serial_read);
-#endif /* SERIAL_HAVE_READ */
} /* void module_register */
} /* void module_register */