From: Florian Forster <octo@collectd.org>
Date: Sun, 3 Feb 2013 10:36:37 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.1
X-Git-Tag: collectd-5.1.3~13
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=7a6887ad7eef33e04bcb0720c213d05fd9be8a59

Merge branch 'collectd-4.10' into collectd-5.1

Conflicts:
	src/curl_json.c
---

7a6887ad7eef33e04bcb0720c213d05fd9be8a59
diff --cc src/logfile.c
index ded7732b,e13c09e7..0f20f3ca
--- a/src/logfile.c
+++ b/src/logfile.c
@@@ -77,11 -92,10 +77,11 @@@ static int logfile_config (const char *
  	return 0;
  } /* int logfile_config (const char *, const char *) */
  
 -static void logfile_print (const char *msg, int severity, time_t timestamp_time)
 +static void logfile_print (const char *msg, int severity,
 +	   	cdtime_t timestamp_time)
  {
  	FILE *fh;
- 	int do_close = 0;
+ 	_Bool do_close = 0;
  	struct tm timestamp_tm;
  	char timestamp_str[64];
  	char level_str[16] = "";