From: Vincent Bernat <bernat@luffy.cx>
Date: Thu, 1 Oct 2009 06:53:25 +0000 (+0200)
Subject: Merge branch '15-old-compat'
X-Git-Tag: 0.5.0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cefe8d05859751cfc4869b45030f5b94e543ae1d;p=thirdparty%2Flldpd.git

Merge branch '15-old-compat'

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

cefe8d05859751cfc4869b45030f5b94e543ae1d
diff --cc src/lldpd.h
index 5f270835,4db9a07e..94e26f02
--- a/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 *);