From: Costa Tsaousis Date: Wed, 7 Dec 2016 20:37:17 +0000 (+0200) Subject: Merge pull request #1329 from ktsaou/master X-Git-Tag: v1.5.0~155 X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;h=bf91af27976cfb634d27a1a7faa1f20067170db5;hp=61915b30f361df12378c6c9b9eaa942190a6d26a;p=netdata.git Merge pull request #1329 from ktsaou/master fix for bit-limited flags, not working properly in gcc versions --- diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am index d10c693e..eefe894c 100644 --- a/conf.d/Makefile.am +++ b/conf.d/Makefile.am @@ -13,10 +13,6 @@ dist_config_DATA = \ health_email_recipients.conf \ $(NULL) -chartsconfigdir=$(configdir)/charts.d -dist_chartsconfig_DATA = \ - $(NULL) - nodeconfigdir=$(configdir)/node.d dist_nodeconfig_DATA = \ node.d/README.md \ diff --git a/src/web_client.h b/src/web_client.h index 2555a0c2..8db1bae5 100644 --- a/src/web_client.h +++ b/src/web_client.h @@ -34,7 +34,7 @@ struct response { Bytef zbuffer[ZLIB_CHUNK]; // temporary buffer for storing compressed output size_t zsent; // the compressed bytes we have sent to the client size_t zhave; // the compressed bytes that we have received from zlib - int zinitialized:1; + int zinitialized; #endif /* NETDATA_WITH_ZLIB */ };