From b424a1b9125cc507e80848a40f5044da4105240b Mon Sep 17 00:00:00 2001 From: Daniel Erat Date: Sun, 17 Jul 2011 21:57:53 +0000 Subject: [PATCH] move sqlite3.c compilation to separate target Change-Id: I277302c0e8c3c3f640fc4d01b5d71492007106f6 --- misc/sqlite/Makefile | 1 + misc/sqlite/sqlite3_obj.c | 2 ++ misc/sqlite/sqlite3_os_go.c | 9 ++++++--- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 misc/sqlite/sqlite3_obj.c diff --git a/misc/sqlite/Makefile b/misc/sqlite/Makefile index 7b893ee79..27b02900e 100644 --- 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 diff --git a/misc/sqlite/sqlite3_obj.c b/misc/sqlite/sqlite3_obj.c new file mode 100644 index 000000000..a865b158f --- /dev/null +++ b/misc/sqlite/sqlite3_obj.c @@ -0,0 +1,2 @@ +#define SQLITE_OS_OTHER 1 +#include "sqlite3.c" diff --git a/misc/sqlite/sqlite3_os_go.c b/misc/sqlite/sqlite3_os_go.c index 26939897a..9fe31d32f 100644 --- a/misc/sqlite/sqlite3_os_go.c +++ b/misc/sqlite/sqlite3_os_go.c @@ -1,7 +1,10 @@ -#define _POSIX_C_SOURCE 200809L +#include +#include + #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 {