aboutsummaryrefslogtreecommitdiffstats
path: root/src/wrap/sqlite/sqlite.diff
blob: 1a3ef764cf66acee8ae1ae6e7ac934f8982e402b (plain)
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
70
71
72
73
74
75
76
77
--- Makefile.in.orig	2009-10-30 09:34:59.000000000 -0400
+++ Makefile.in	2010-01-21 22:51:22.000000000 -0500
@@ -133,7 +133,10 @@
 GCOV_LDFLAGS1 = -lgcov
 USE_GCOV = @USE_GCOV@
 LTCOMPILE_EXTRAS += $(GCOV_CFLAGS$(USE_GCOV))
+LTCOMPILE_EXTRAS += -DSQLITE_HAS_CODEC
 LTLINK_EXTRAS += $(GCOV_LDFLAGS$(USE_GCOV))
+LTLINK_EXTRAS += -lstdc++
+LTLINK_EXTRAS += -lbotan
 
 
 # The directory into which to store package information for
@@ -176,7 +179,8 @@
         table.lo tokenize.lo trigger.lo update.lo \
         util.lo vacuum.lo \
         vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo \
-        walker.lo where.lo utf.lo vtab.lo
+        walker.lo where.lo utf.lo vtab.lo \
+	codec.lo codecext.lo
 
 # Object files for the amalgamation.
 #
@@ -275,7 +279,10 @@
   $(TOP)/src/vdbeInt.h \
   $(TOP)/src/vtab.c \
   $(TOP)/src/walker.c \
-  $(TOP)/src/where.c
+  $(TOP)/src/where.c \
+  $(TOP)/src/botan/codec.cpp \
+  $(TOP)/src/botan/codecext.cpp \
+  $(TOP)/src/botan/codec.h
 
 # Generated source code files
 #
@@ -411,6 +418,7 @@
    $(TOP)/src/sqlite3ext.h \
    $(TOP)/src/sqliteInt.h  \
    $(TOP)/src/vdbe.h \
+   $(TOP)/src/botan/codec.h \
    $(TOP)/src/vdbeInt.h \
    parse.h \
    config.h
@@ -622,6 +630,13 @@
 notify.lo:	$(TOP)/src/notify.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/notify.c
 
+codec.lo:	$(TOP)/src/botan/codec.cpp $(HDR) $(TOP)/src/botan/codec.h
+	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/botan/codec.cpp
+
+codecext.lo:	$(TOP)/src/botan/codecext.cpp $(HDR) $(TOP)/src/botan/codec.h
+	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/botan/codecext.cpp
+
+
 pager.lo:	$(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/pager.c
 
--- src/pager.c.orig	2009-10-30 17:01:07.000000000 -0400
+++ src/pager.c	2010-01-21 22:51:53.000000000 -0500
@@ -5046,7 +5046,7 @@
 /*
 ** Set or retrieve the codec for this pager
 */
-static void sqlite3PagerSetCodec(
+void sqlite3PagerSetCodec(
   Pager *pPager,
   void *(*xCodec)(void*,void*,Pgno,int),
   void (*xCodecSizeChng)(void*,int,int),
@@ -5060,7 +5060,7 @@
   pPager->pCodec = pCodec;
   pagerReportSize(pPager);
 }
-static void *sqlite3PagerGetCodec(Pager *pPager){
+void *sqlite3PagerGetCodec(Pager *pPager){
   return pPager->pCodec;
 }
 #endif