Build: cleanups for C++ compatibility

Signed-off-by: Eduardo Silva <[email protected]>
fluent · Aug 26, 2015 · cd2f696 · cd2f696
1 parent 7f5606b
commit cd2f696
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/include/fluent-bit.h b/include/fluent-bit.h
@@ -20,6 +20,10 @@
 #ifndef FLUENT_BIT_H
 #define FLUENT_BIT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <mk_core/mk_core.h>
 #include <fluent-bit/flb_macros.h>
 #include <fluent-bit/flb_utils.h>
@@ -29,4 +33,9 @@
 #include <fluent-bit/flb_output.h>
 #include <fluent-bit/flb_engine.h>
 #include <fluent-bit/flb_lib.h>
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/flb_config.c b/src/flb_config.c
@@ -26,7 +26,6 @@
 
 struct flb_config *flb_config_init()
 {
- int ret;
  struct flb_config *config;
 
  __flb_config_verbose = FLB_FALSE;

diff --git a/src/flb_lib.c b/src/flb_lib.c
@@ -107,6 +107,10 @@ int flb_lib_start(struct flb_config *config)
  mk_event_foreach(event, config->ch_evl) {
  fd = event->fd;
  bytes = read(fd, &val, sizeof(uint64_t));
+ if (bytes <= 0) {
+ return -1;
+ }
+
  if (val == FLB_ENGINE_STARTED) {
  flb_debug("[lib] backend started");
  break;