merge stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Tue, 10 Dec 2013 10:43:13 +0100
branchstable-1.5
changeset 2538 51ad16e57f8f
parent 2536 15f122b0f3d2 (current diff)
parent 2537 298ce9f9050f (diff)
child 2539 d2d43d2e7f31
merge
--- a/master/datagram_pair.c	Tue Dec 10 10:42:25 2013 +0100
+++ b/master/datagram_pair.c	Tue Dec 10 10:43:13 2013 +0100
@@ -185,7 +185,9 @@
             dev_idx++) {
         ec_datagram_t *datagram = &pair->datagrams[dev_idx];
 
+#ifdef EC_RT_SYSLOG
         ec_datagram_output_stats(datagram);
+#endif
 
         if (datagram->state == EC_DATAGRAM_RECEIVED) {
             pair_wc += datagram->working_counter;