diff options
| author | mattn <mattn.jp@gmail.com> | 2013-08-28 14:46:33 +0900 |
|---|---|---|
| committer | mattn <mattn.jp@gmail.com> | 2013-08-28 14:46:33 +0900 |
| commit | 691a8a9de39861ab7f63b5a92d0c5cbf610f3049 (patch) | |
| tree | 616e3d7f775f814ad930b46e30ca84f36336f626 | |
| parent | Merge pull request #73 from cookieo9/extlist (diff) | |
| download | golite-691a8a9de39861ab7f63b5a92d0c5cbf610f3049.tar.gz golite-691a8a9de39861ab7f63b5a92d0c5cbf610f3049.tar.xz | |
Use sqlite3.c in all platforms
| -rw-r--r-- | example/extension/extension.go | 2 | ||||
| -rw-r--r-- | example/extension/sqlite3_mod_regexp.c (renamed from example/extension/sqlite3_mod_regexp.c.example) | 8 | ||||
| -rw-r--r-- | sqlite3.c (renamed from sqlite3_windows.c) | 0 | ||||
| -rw-r--r-- | sqlite3_other.go | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/example/extension/extension.go b/example/extension/extension.go index f58ea3a..61ceb55 100644 --- a/example/extension/extension.go +++ b/example/extension/extension.go @@ -11,7 +11,7 @@ func main() { sql.Register("sqlite3_with_extensions", &sqlite3.SQLiteDriver{ Extensions: []string{ - "sqlite3_mod_regexp.dll", + "sqlite3_mod_regexp", }, }) diff --git a/example/extension/sqlite3_mod_regexp.c.example b/example/extension/sqlite3_mod_regexp.c index 364c146..277764d 100644 --- a/example/extension/sqlite3_mod_regexp.c.example +++ b/example/extension/sqlite3_mod_regexp.c @@ -1,4 +1,4 @@ -#include <regex.h> +#include <pcre.h> #include <string.h> #include <stdio.h> #include <sqlite3ext.h> @@ -21,7 +21,11 @@ static void regexp_func(sqlite3_context *context, int argc, sqlite3_value **argv sqlite3_result_int(context, 1); } } -__declspec(dllexport) int sqlite3_extension_init(sqlite3 *db, char **errmsg, const sqlite3_api_routines *api) { + +#ifdef _WIN32 +__declspec(dllexport) +#endif +int sqlite3_extension_init(sqlite3 *db, char **errmsg, const sqlite3_api_routines *api) { SQLITE_EXTENSION_INIT2(api); return sqlite3_create_function(db, "regexp", 2, SQLITE_UTF8, (void*)db, regexp_func, NULL, NULL); } diff --git a/sqlite3_windows.c b/sqlite3.c index 7d53444..7d53444 100644 --- a/sqlite3_windows.c +++ b/sqlite3.c diff --git a/sqlite3_other.go b/sqlite3_other.go index 96fb194..52fea18 100644 --- a/sqlite3_other.go +++ b/sqlite3_other.go @@ -3,6 +3,6 @@ package sqlite3 /* -#cgo pkg-config: sqlite3 +#cgo LDFLAGS: -v -ldl */ import "C" |