1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
diff -Nur -x json orig/whitedb/configure.ac whitedb+dfsg/configure.ac
--- orig/whitedb/configure.ac 2020-08-03 20:07:18.000000000 +0200
+++ whitedb+dfsg/configure.ac 2023-07-02 09:35:42.250696028 +0200
@@ -293,7 +293,6 @@
AC_OUTPUT([
Makefile
Db/Makefile
-json/Makefile
Test/Makefile
Main/Makefile
Examples/Makefile
diff -Nur -x json orig/whitedb/Db/dbjson.c whitedb+dfsg/Db/dbjson.c
--- orig/whitedb/Db/dbjson.c 2020-08-03 20:21:30.000000000 +0200
+++ whitedb+dfsg/Db/dbjson.c 2023-07-02 09:35:42.250696028 +0200
@@ -55,7 +55,9 @@
#include "dbschema.h"
#include "dbjson.h"
#include "dbutil.h"
-#include "../json/yajl_api.h"
+#include <yajl/yajl_common.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_parse.h>
#ifdef _WIN32
#define strncpy(d, s, sz) strncpy_s(d, sz+1, s, sz)
diff -Nur -x json orig/whitedb/Main/Makefile.am whitedb+dfsg/Main/Makefile.am
--- orig/whitedb/Main/Makefile.am 2020-08-03 20:07:18.000000000 +0200
+++ whitedb+dfsg/Main/Makefile.am 2023-07-02 09:35:18.123015782 +0200
@@ -12,7 +12,6 @@
printerdir=../Printer
parserdir=../Parser
reasonerdir=../Reasoner
-jsondir=../json
testdir=../Test
# ---- targets ----
@@ -41,7 +40,7 @@
# ----- all sources for the created programs -----
libwgdb_la_SOURCES =
-libwgdb_la_LIBADD = $(dbdir)/libDb.la ${jsondir}/libjson.la
+libwgdb_la_LIBADD = $(dbdir)/libDb.la -lyajl
if REASONER
libwgdb_la_LIBADD += $(parserdir)/libParser.la \
$(printerdir)/libPrinter.la $(reasonerdir)/libReasoner.la
diff -Nur -x json orig/whitedb/Makefile.am whitedb+dfsg/Makefile.am
--- orig/whitedb/Makefile.am 2020-08-03 20:07:18.000000000 +0200
+++ whitedb+dfsg/Makefile.am 2023-07-02 09:35:42.250696028 +0200
@@ -7,7 +7,7 @@
#AUTOMAKE_OPTIONS = foreign
AUTOMAKE_OPTIONS = subdir-objects
-SUBDIRS = Db json
+SUBDIRS = Db
if REASONER
SUBDIRS += Parser Reasoner Printer
endif
diff -Nur -x json orig/whitedb/Server/dserve.c whitedb+dfsg/Server/dserve.c
--- orig/whitedb/Server/dserve.c 2020-08-03 20:21:30.000000000 +0200
+++ whitedb+dfsg/Server/dserve.c 2023-07-02 09:35:42.250696028 +0200
@@ -88,7 +88,7 @@
#include <unistd.h> // for alarm
#endif
-//#include "../json/yajl_all.h"
+//#include <yajl/yajl_all.h>
/* =============== local protos =================== */
|
