From 01b1e89847a0a520ef81fcee2ae32c91accfc9ad Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Thu, 24 Feb 2022 08:43:59 +0900 Subject: [PATCH] Move C code to amalgamation Fixes #1020 --- sqlite3-binding.c => amalgamation/sqlite3-binding.c | 0 sqlite3-binding.h => amalgamation/sqlite3-binding.h | 0 .../sqlite3_opt_unlock_notify.c | 0 sqlite3ext.h => amalgamation/sqlite3ext.h | 0 backup.go | 2 +- callback.go | 2 +- error.go | 2 +- sqlite3.go | 2 +- sqlite3_context.go | 2 +- sqlite3_load_extension.go | 2 +- sqlite3_opt_column_metadata.go | 2 +- sqlite3_opt_preupdate_hook.go | 2 +- sqlite3_opt_unlock_notify.go | 2 +- sqlite3_opt_userauth.go | 2 +- sqlite3_opt_vtable.go | 2 +- sqlite3_trace.go | 2 +- sqlite3_type.go | 2 +- 17 files changed, 13 insertions(+), 13 deletions(-) rename sqlite3-binding.c => amalgamation/sqlite3-binding.c (100%) rename sqlite3-binding.h => amalgamation/sqlite3-binding.h (100%) rename sqlite3_opt_unlock_notify.c => amalgamation/sqlite3_opt_unlock_notify.c (100%) rename sqlite3ext.h => amalgamation/sqlite3ext.h (100%) diff --git a/sqlite3-binding.c b/amalgamation/sqlite3-binding.c similarity index 100% rename from sqlite3-binding.c rename to amalgamation/sqlite3-binding.c diff --git a/sqlite3-binding.h b/amalgamation/sqlite3-binding.h similarity index 100% rename from sqlite3-binding.h rename to amalgamation/sqlite3-binding.h diff --git a/sqlite3_opt_unlock_notify.c b/amalgamation/sqlite3_opt_unlock_notify.c similarity index 100% rename from sqlite3_opt_unlock_notify.c rename to amalgamation/sqlite3_opt_unlock_notify.c diff --git a/sqlite3ext.h b/amalgamation/sqlite3ext.h similarity index 100% rename from sqlite3ext.h rename to amalgamation/sqlite3ext.h diff --git a/backup.go b/backup.go index ecbb469..028a0b6 100644 --- a/backup.go +++ b/backup.go @@ -7,7 +7,7 @@ package sqlite3 /* #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/callback.go b/callback.go index b020fe3..aaa8228 100644 --- a/callback.go +++ b/callback.go @@ -12,7 +12,7 @@ package sqlite3 /* #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/error.go b/error.go index 58ab252..21cdc35 100644 --- a/error.go +++ b/error.go @@ -7,7 +7,7 @@ package sqlite3 /* #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/sqlite3.go b/sqlite3.go index e037857..545064c 100644 --- a/sqlite3.go +++ b/sqlite3.go @@ -25,7 +25,7 @@ package sqlite3 #cgo openbsd CFLAGS: -I/usr/local/include #cgo openbsd LDFLAGS: -L/usr/local/lib #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/sqlite3_context.go b/sqlite3_context.go index 7c7431d..1cf3ece 100644 --- a/sqlite3_context.go +++ b/sqlite3_context.go @@ -8,7 +8,7 @@ package sqlite3 /* #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/sqlite3_load_extension.go b/sqlite3_load_extension.go index 9433fea..4b3b963 100644 --- a/sqlite3_load_extension.go +++ b/sqlite3_load_extension.go @@ -9,7 +9,7 @@ package sqlite3 /* #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/sqlite3_opt_column_metadata.go b/sqlite3_opt_column_metadata.go index c67fa82..773cf3a 100644 --- a/sqlite3_opt_column_metadata.go +++ b/sqlite3_opt_column_metadata.go @@ -5,7 +5,7 @@ package sqlite3 /* #ifndef USE_LIBSQLITE3 #cgo CFLAGS: -DSQLITE_ENABLE_COLUMN_METADATA -#include +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/sqlite3_opt_preupdate_hook.go b/sqlite3_opt_preupdate_hook.go index b2e18bb..92d9978 100644 --- a/sqlite3_opt_preupdate_hook.go +++ b/sqlite3_opt_preupdate_hook.go @@ -13,7 +13,7 @@ package sqlite3 #cgo LDFLAGS: -lm #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/sqlite3_opt_unlock_notify.go b/sqlite3_opt_unlock_notify.go index adfa26c..effeb90 100644 --- a/sqlite3_opt_unlock_notify.go +++ b/sqlite3_opt_unlock_notify.go @@ -12,7 +12,7 @@ package sqlite3 #cgo CFLAGS: -DSQLITE_ENABLE_UNLOCK_NOTIFY #include -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" extern void unlock_notify_callback(void *arg, int argc); */ diff --git a/sqlite3_opt_userauth.go b/sqlite3_opt_userauth.go index b62b608..5af5809 100644 --- a/sqlite3_opt_userauth.go +++ b/sqlite3_opt_userauth.go @@ -11,7 +11,7 @@ package sqlite3 #cgo CFLAGS: -DSQLITE_USER_AUTHENTICATION #cgo LDFLAGS: -lm #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/sqlite3_opt_vtable.go b/sqlite3_opt_vtable.go index 4a93c46..402fbe3 100644 --- a/sqlite3_opt_vtable.go +++ b/sqlite3_opt_vtable.go @@ -19,7 +19,7 @@ package sqlite3 #cgo CFLAGS: -Wno-deprecated-declarations #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/sqlite3_trace.go b/sqlite3_trace.go index 56bb914..319b372 100644 --- a/sqlite3_trace.go +++ b/sqlite3_trace.go @@ -9,7 +9,7 @@ package sqlite3 /* #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif diff --git a/sqlite3_type.go b/sqlite3_type.go index 0fd8210..7823668 100644 --- a/sqlite3_type.go +++ b/sqlite3_type.go @@ -6,7 +6,7 @@ package sqlite3 /* #ifndef USE_LIBSQLITE3 -#include "sqlite3-binding.h" +#include "amalgamation/sqlite3-binding.h" #else #include #endif