Merge branch '15-old-compat'

Fix a conflict in src/lldpd.h. This is just a space story.

diff --cc src/interfaces.c
Simple merge

diff --cc src/lldpd.c
Simple merge

diff --cc src/lldpd.h
index 5f2708350ffad5eab2ea4cc560114139d8ababe9,4db9a07ee861db4ba1d00fb7040c57cfd3a9dcf5..94e26f02125862ffa6766c554100bf65c69ab1d8
--- 1/src/lldpd.h
--- 2/src/lldpd.h
+++ b/src/lldpd.h
@@@ -412,15 -414,15 +415,15 @@@ char    *dmi_asset(void)
  #endif
  
  /* log.c */
- void             log_init(int);
+ void             log_init(int, const char *);
 -void             log_warn(const char *, ...);
 +void             log_warn(const char *, ...) __attribute__ ((format (printf, 1, 2)));
- #define LLOG_WARN(x,...) log_warn("%s: " x, __FUNCTION__, ##__VA_ARGS__)
+ #define LLOG_WARN(x,...) log_warn("%s: " x, __FUNCTION__ , ## __VA_ARGS__)
 -void             log_warnx(const char *, ...);
 +void             log_warnx(const char *, ...) __attribute__ ((format (printf, 1, 2)));
- #define LLOG_WARNX(x,...) log_warnx("%s: " x,  __FUNCTION__, ##__VA_ARGS__)
+ #define LLOG_WARNX(x,...) log_warnx("%s: " x,  __FUNCTION__ , ## __VA_ARGS__)
 -void             log_info(const char *, ...);
 +void             log_info(const char *, ...) __attribute__ ((format (printf, 1, 2)));
- #define LLOG_INFO(x,...) log_info("%s: " x, __FUNCTION__, ##__VA_ARGS__)
+ #define LLOG_INFO(x,...) log_info("%s: " x, __FUNCTION__ , ## __VA_ARGS__)
 -void             log_debug(const char *, ...);
 +void             log_debug(const char *, ...) __attribute__ ((format (printf, 1, 2)));
- #define LLOG_DEBUG(x,...) log_debug("%s: " x, __FUNCTION__, ##__VA_ARGS__)
+ #define LLOG_DEBUG(x,...) log_debug("%s: " x, __FUNCTION__ , ## __VA_ARGS__)
  void             fatal(const char *);
  void             fatalx(const char *);