1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00

Merge branch 'master' into develop

This commit is contained in:
Steffen Vogel 2017-11-02 18:08:43 +01:00
commit 976d213d04
13 changed files with 19 additions and 1 deletions

View file

@ -34,7 +34,7 @@
#include "list.h"
#if ZMQ_VERSION_MAJOR > 4 || (ZMQ_VERSION_MAJOR == 4 && ZMQ_VERSION_MINOR >= 2)
#if ZMQ_BUILD_DRAFT_API && (ZMQ_VERSION_MAJOR > 4 || (ZMQ_VERSION_MAJOR == 4 && ZMQ_VERSION_MINOR >= 2))
#define ZMQ_BUILD_DISH 1
#endif

View file

@ -20,6 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#include <string.h>
#include "plugin.h"
#include "api.h"
#include "super_node.h"

View file

@ -24,6 +24,8 @@
* @{
*/
#include <string.h>
#include "hook.h"
#include "plugin.h"
#include "sample.h"

View file

@ -25,6 +25,7 @@
*/
#include <inttypes.h>
#include <string.h>
#include "hook.h"
#include "plugin.h"

View file

@ -24,6 +24,8 @@
* @{
*/
#include <string.h>
#include "hook.h"
#include "plugin.h"
#include "timing.h"

View file

@ -24,6 +24,8 @@
* @{
*/
#include <string.h>
#include "common.h"
#include "advio.h"
#include "hook.h"

View file

@ -22,6 +22,7 @@
#include <ctype.h>
#include <inttypes.h>
#include <string.h>
#include "io/csv.h"
#include "plugin.h"

View file

@ -20,6 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#include <string.h>
#include "node.h"
#include "plugin.h"
#include "config.h"

View file

@ -22,6 +22,7 @@
*********************************************************************************/
#include <math.h>
#include <string.h>
#include "node.h"
#include "plugin.h"

View file

@ -24,6 +24,8 @@
* @{
*/
#include <string.h>
#include "nodes/stats.h"
#include "hook.h"
#include "plugin.h"

View file

@ -21,6 +21,7 @@
*********************************************************************************/
#include <stdio.h>
#include <string.h>
#include <sys/stat.h>
#include "node.h"

View file

@ -20,6 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#include <string.h>
#include <zmq.h>
#if ZMQ_VERSION_MAJOR < 4 || (ZMQ_VERSION_MAJOR == 4 && ZMQ_VERSION_MINOR <= 1)

View file

@ -21,6 +21,7 @@
*********************************************************************************/
#include <dlfcn.h>
#include <string.h>
#include "plugin.h"