niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into sec-plus-master

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-03-30 12:09:03 +02:00
commit 5b1f288d6c
37 changed files with 522 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/ddsc/tests/config.c
View file

@ -12,7 +12,6 @@
#include <stdlib.h>
#include "dds/dds.h"
#include "CUnit/Test.h"
#include "config_env.h"
#include "dds/version.h"
@ -22,6 +21,8 @@
#include "dds/ddsi/q_misc.h"
#include "dds/ddsi/ddsi_xqos.h"
#include "test_common.h"
#define FORCE_ENV
#define URI_VARIABLE DDS_PROJECT_NAME_NOSPACE_CAPS"_URI"