aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStéphane Graber <stgraber@ubuntu.com>2015-03-11 15:18:10 -0400
committerStéphane Graber <stgraber@ubuntu.com>2015-03-11 16:19:50 -0400
commit3d6c6f934500002267363041852b31a7a4e32159 (patch)
tree5bece53f178b9895211893f90caeacb3c9368587
parentMerge pull request #178 from antoni/master (diff)
downloadgolite-3d6c6f934500002267363041852b31a7a4e32159.tar.gz
golite-3d6c6f934500002267363041852b31a7a4e32159.tar.xz
Rename sqlite3.{c,h} to sqlite3-binding.{c,h}
This fixes the problem where when building with gccgo, sqlite3.c is overwritten, leading to a build failure. An alternative would have been to move sqlite3*.{c,h} to a subdirectory, but that seems to confuse the linker a fair bit and would just swap one implementation-dependent issue for another. Closes #20 Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
-rw-r--r--README.md4
-rw-r--r--_example/mod_vtable/sqlite3_mod_vtable.cc2
-rw-r--r--backup.go2
-rw-r--r--sqlite3-binding.c (renamed from sqlite3.c)0
-rw-r--r--sqlite3-binding.h (renamed from sqlite3.h)0
-rw-r--r--sqlite3.go2
-rw-r--r--sqlite3ext.h2
7 files changed, 7 insertions, 5 deletions
diff --git a/README.md b/README.md
index 1433fe5..4383f0c 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,9 @@ License
MIT: http://mattn.mit-license.org/2012
-sqlite.c, sqlite3.h, sqlite3ext.h
+sqlite3-binding.c, sqlite3-binding.h, sqlite3ext.h
+
+The -binding suffix was added to avoid build failures under gccgo.
In this repository, those files are amalgamation code that copied from SQLite3. The license of those codes are depend on the license of SQLite3.
diff --git a/_example/mod_vtable/sqlite3_mod_vtable.cc b/_example/mod_vtable/sqlite3_mod_vtable.cc
index 4caf484..5bd4e66 100644
--- a/_example/mod_vtable/sqlite3_mod_vtable.cc
+++ b/_example/mod_vtable/sqlite3_mod_vtable.cc
@@ -1,6 +1,6 @@
#include <string>
#include <sstream>
-#include <sqlite3.h>
+#include <sqlite3-binding.h>
#include <sqlite3ext.h>
#include <curl/curl.h>
#include "picojson.h"
diff --git a/backup.go b/backup.go
index 270446a..3807c60 100644
--- a/backup.go
+++ b/backup.go
@@ -6,7 +6,7 @@
package sqlite3
/*
-#include <sqlite3.h>
+#include <sqlite3-binding.h>
#include <stdlib.h>
*/
import "C"
diff --git a/sqlite3.c b/sqlite3-binding.c
index 9228d24..9228d24 100644
--- a/sqlite3.c
+++ b/sqlite3-binding.c
diff --git a/sqlite3.h b/sqlite3-binding.h
index e86d83f..e86d83f 100644
--- a/sqlite3.h
+++ b/sqlite3-binding.h
diff --git a/sqlite3.go b/sqlite3.go
index 5f94a96..4cdc4d5 100644
--- a/sqlite3.go
+++ b/sqlite3.go
@@ -9,7 +9,7 @@ package sqlite3
#cgo CFLAGS: -std=gnu99
#cgo CFLAGS: -DSQLITE_ENABLE_RTREE -DSQLITE_THREADSAFE
#cgo CFLAGS: -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
-#include <sqlite3.h>
+#include <sqlite3-binding.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sqlite3ext.h b/sqlite3ext.h
index ecf93f6..7cc58b6 100644
--- a/sqlite3ext.h
+++ b/sqlite3ext.h
@@ -17,7 +17,7 @@
*/
#ifndef _SQLITE3EXT_H_
#define _SQLITE3EXT_H_
-#include "sqlite3.h"
+#include "sqlite3-binding.h"
typedef struct sqlite3_api_routines sqlite3_api_routines;