Merge branch 'master' of ssh://camlistore.org:29418/camlistore

2011-07-17 15:27:42 -07:00 · 2011-07-17 15:27:42 -07:00 · 637df31ac7
parent 114404d4a7 b424a1b912
commit 637df31ac7
3 changed files with 9 additions and 3 deletions
--- a/misc/sqlite/Makefile
+++ b/misc/sqlite/Makefile
@ -7,6 +7,7 @@ CGOFILES=\
 	sqlite.go\

 CGO_OFILES=\
+	sqlite3_obj.o\
 	sqlite3_os_go.o\

 include $(GOROOT)/src/Make.pkg
--- a/misc/sqlite/sqlite3_obj.c
+++ b/misc/sqlite/sqlite3_obj.c
@ -0,0 +1,2 @@
+#define SQLITE_OS_OTHER 1
+#include "sqlite3.c"
--- a/misc/sqlite/sqlite3_os_go.c
+++ b/misc/sqlite/sqlite3_os_go.c
@ -1,7 +1,10 @@
-#define _POSIX_C_SOURCE 200809L
+#include <stdlib.h>
+#include <string.h>
+
 #include "_cgo_export.h"
-#define SQLITE_OS_OTHER 1
-#include "sqlite3.c"
+
+#define SKIP_SQLITE_VERSION
+#include "sqlite3.h"

 typedef struct GoFile GoFile;
 struct GoFile {