[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/emacsql 5bef799b6b 220/427: Make some tweaks to accommodat
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/emacsql 5bef799b6b 220/427: Make some tweaks to accommodate Windows. |
Date: |
Tue, 13 Dec 2022 02:59:45 -0500 (EST) |
branch: elpa/emacsql
commit 5bef799b6b2288f9fd5f6369b7d25e680897d0d5
Author: Christopher Wellons <wellons@nullprogram.com>
Commit: Christopher Wellons <wellons@nullprogram.com>
Make some tweaks to accommodate Windows.
---
sqlite/Makefile | 11 +++++++++--
sqlite/emacsql.c | 5 ++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/sqlite/Makefile b/sqlite/Makefile
index 3679e6f93c..4e47907d27 100644
--- a/sqlite/Makefile
+++ b/sqlite/Makefile
@@ -1,5 +1,12 @@
-BINARY = emacsql-sqlite-$(shell uname -sm | tr '[A-Z]' '[a-z]' | tr ' ' '-')
-LDLIBS = -ldl
+ifeq ($(OS),Windows_NT)
+ OSTUPLE = windows-x86
+ BINARY = emacsql-sqlite-$(OSTUPLE).exe
+else
+ OSTUPLE = $(shell uname -sm | tr '[A-Z]' '[a-z]' | tr ' ' '-')
+ BINARY = emacsql-sqlite-$(OSTUPLE)
+ LDLIBS = -ldl
+endif
+
CFLAGS = -O2 --std=c99 -W -Wall -Wextra
CFLAGS += -DSQLITE_THREADSAFE=0
CFLAGS += -DSQLITE_DEFAULT_FOREIGN_KEYS=1
diff --git a/sqlite/emacsql.c b/sqlite/emacsql.c
index bb163aa578..3a65f540eb 100644
--- a/sqlite/emacsql.c
+++ b/sqlite/emacsql.c
@@ -80,10 +80,9 @@ int main(int argc, char **argv) {
fflush(stdout);
/* Gather input from Emacs. */
- size_t length;
- int result = scanf("%zu ", &length);
+ unsigned length;
+ int result = scanf("%u ", &length);
if (result == EOF) {
- printf("EOF DETECTED\n");
break;
} else if (result != 1) {
send_error(SQLITE_ERROR, "middleware parsing error");
- [nongnu] elpa/emacsql e6ab07e16b 140/427: Switch to a friendlier name., (continued)
- [nongnu] elpa/emacsql e6ab07e16b 140/427: Switch to a friendlier name., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql bec6af6940 148/427: Add VACUUM., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 03aebdecd1 160/427: Rename :log option to :debug., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql bb221f6134 161/427: Drop .print command flushing., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 72b34f6522 173/427: Add some more autoloading., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 3229cd41af 180/427: Change the requirements for front-end implementations., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 431a3b325f 200/427: Toss "reap" and switch to new finalize with Cask., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql ed86b098ce 197/427: Add prefix arg to emacsql-show-last-sql., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 027c5df94e 209/427: Organize all the keywords in the README., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 1ebbc22411 212/427: Disable undo in process buffers., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 5bef799b6b 220/427: Make some tweaks to accommodate Windows.,
ELPA Syncer <=
- [nongnu] elpa/emacsql 0cb9e47d24 227/427: Test all available backends., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 730e4d882a 235/427: Fix up the README., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 4b45472ffa 240/427: Don't copy the binary every time., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql c89ccf82df 241/427: Make a reconnect generic method., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 159195690d 245/427: Include bin/ in the package., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql f98ee5e7cd 246/427: Use no-undo buffers., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 4b58a6717e 250/427: Don't use temporary tables in foreign key test., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 462d1f1b31 252/427: Fix stupid backslash escape mode in MySQL., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql b0f0d3085d 258/427: Get OS tuple from Emacs., ELPA Syncer, 2022/12/13
- [nongnu] elpa/emacsql 1b5891298a 255/427: Officially add MySQL to unit testing., ELPA Syncer, 2022/12/13