Forgot to surround surround yaml include with defines

This commit is contained in:
Willem Toorop 2018-01-17 17:07:36 +01:00
parent 9e34588f19
commit 155b035cd8
2 changed files with 3 additions and 1 deletions

View File

@ -323,7 +323,7 @@ convert.lo convert.o: $(srcdir)/convert.c \
$(srcdir)/util/orig-headers/locks.h $(srcdir)/util/auxiliary/util/log.h $(srcdir)/debug.h $(srcdir)/rr-iter.h \ $(srcdir)/util/orig-headers/locks.h $(srcdir)/util/auxiliary/util/log.h $(srcdir)/debug.h $(srcdir)/rr-iter.h \
$(srcdir)/rr-dict.h $(srcdir)/gldns/gbuffer.h $(srcdir)/gldns/pkthdr.h $(srcdir)/anchor.h $(srcdir)/gldns/wire2str.h \ $(srcdir)/rr-dict.h $(srcdir)/gldns/gbuffer.h $(srcdir)/gldns/pkthdr.h $(srcdir)/anchor.h $(srcdir)/gldns/wire2str.h \
$(srcdir)/gldns/str2wire.h $(srcdir)/gldns/rrdef.h $(srcdir)/gldns/parseutil.h $(srcdir)/const-info.h $(srcdir)/dict.h \ $(srcdir)/gldns/str2wire.h $(srcdir)/gldns/rrdef.h $(srcdir)/gldns/parseutil.h $(srcdir)/const-info.h $(srcdir)/dict.h \
$(srcdir)/list.h $(srcdir)/jsmn/jsmn.h $(stubbysrcdir)/src/yaml/convert_yaml_to_json.h $(srcdir)/convert.h $(srcdir)/list.h $(srcdir)/jsmn/jsmn.h $(srcdir)/convert.h
dict.lo dict.o: $(srcdir)/dict.c \ dict.lo dict.o: $(srcdir)/dict.c \
config.h \ config.h \
$(srcdir)/types-internal.h \ $(srcdir)/types-internal.h \

View File

@ -56,7 +56,9 @@
#include "dict.h" #include "dict.h"
#include "list.h" #include "list.h"
#include "jsmn/jsmn.h" #include "jsmn/jsmn.h"
#ifdef USE_YAML_CONFIG
#include "yaml/convert_yaml_to_json.h" #include "yaml/convert_yaml_to_json.h"
#endif
#include "convert.h" #include "convert.h"
#include "debug.h" #include "debug.h"