Changeset 3593 for XerialJ/trunk/sqlite-jdbc/sqlitejdbc

Timestamp:

09/16/09 17:18:42 (3 years ago)

Author:

leo

Message:

built-in extension-functions

Location:

XerialJ/trunk/sqlite-jdbc/sqlitejdbc

Files:

• Makefile.nested (modified) (4 diffs)
• ext/extension-functions.c (modified) (6 diffs)

XerialJ/trunk/sqlite-jdbc/sqlitejdbc/Makefile.nested

@@ -1 +1 @@
 include Makefile.common
 
-nestedvm_version := 2007-06-30
+nestedvm_version := 2009-08-09
 nestedvm := nestedvm-$(nestedvm_version)
 
@@ -32 +32 @@
         @mkdir -p dl
         cp ../archive/$(nestedvm).tgz $@
-#       curl -odl/$(nestedvm).tgz http://files.zentus.com/sqlitejdbc/$(nestedvm).tgz
+#       curl -odl/$(nestedvm).tgz http://nestedvm.ibex.org/dist/$(nestedvm).tgz
 
 dl/$(sqlite)-amal.zip:
@@ -50 +50 @@
         perl -pi -e "s/sqlite3_api;/sqlite3_api = 0;/g" \
             build/$(sqlite)-nestedvm/sqlite3ext.h
-
         # we need a dummy main
         echo 'int main() { return 0; }' >> build/$(sqlite)-nestedvm/sqlite3.c
@@ -70 +69 @@
                 sqlite3.c; \
         $$CC -c $$CFLAGS -o NestedDB.o Nested*.c)
-
         ./$(nestedvm)/upstream/install/bin/mips-unknown-elf-gcc \
-                -march=mips1 --static -lc \
+                -march=mips1 --static \
                 -o $@ build/$(sqlite)-nestedvm/sqlite3.o \
-                              build/$(sqlite)-nestedvm/NestedDB.o
+                              build/$(sqlite)-nestedvm/NestedDB.o -lm -lc
 
 build/org/sqlite/SQLite.class: build/SQLite.mips

XerialJ/trunk/sqlite-jdbc/sqlitejdbc/ext/extension-functions.c

@@ -99 +99 @@
 //#include "config.h"
 
-#define COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE 1
+//#define COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE 1
 #define HAVE_ACOSH 1
 #define HAVE_ASINH 1
@@ -131 +131 @@
 #define _MAP_H_
 
-#include <stdint.h>
+//#include <stdint.h>
 
 /*
@@ -139 +139 @@
 
 typedef int(*cmp_func)(const void *, const void *);
-typedef void(*map_iterator)(void*, int64_t, void*);
+typedef void(*map_iterator)(void*, sqlite_int64, void*);
 
 typedef struct node{
@@ -145 +145 @@
   struct node *r;
   void* data;
-  int64_t count;
+  sqlite_int64 count;
 } node;
 
@@ -1883 +1883 @@
 
 int int_cmp(const void *a, const void *b){
-  int64_t aa = *(int64_t *)(a);
-  int64_t bb = *(int64_t *)(b);
+  sqlite_int64 aa = *(sqlite_int64 *)(a);
+  sqlite_int64 bb = *(sqlite_int64 *)(b);
   /* printf("cmp %d <=> %d\n",aa,bb); */
   if(aa==bb)
@@ -1906 +1906 @@
 }
 
-void print_elem(void *e, int64_t c, void* p){
+void print_elem(void *e, sqlite_int64 c, void* p){
   int ee = *(int*)(e);
   printf("%d => %lld\n", ee,c);