From 63531606191b06cb735b195f4f5329b352c236f0 Mon Sep 17 00:00:00 2001
From: Nuno Cruces <ncruces@users.noreply.github.com>
Date: Wed, 25 Oct 2023 00:31:33 +0100
Subject: [PATCH] Improve benchmark repeatability.

---
 sqlite3/func.c                       | 2 +-
 sqlite3/main.c                       | 3 ---
 sqlite3/vfs.c                        | 2 ++
 vfs/tests/mptest/testdata/main.c     | 6 ++----
 vfs/tests/speedtest1/testdata/main.c | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/sqlite3/func.c b/sqlite3/func.c
index 80e4981..f6e54f7 100644
--- a/sqlite3/func.c
+++ b/sqlite3/func.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <stddef.h>
 
 #include "sqlite3.h"
 
diff --git a/sqlite3/main.c b/sqlite3/main.c
index e4ec00d..50f5867 100644
--- a/sqlite3/main.c
+++ b/sqlite3/main.c
@@ -1,6 +1,3 @@
-#include <stdbool.h>
-#include <stddef.h>
-
 // Amalgamation
 #include "sqlite3.c"
 // VFS
diff --git a/sqlite3/vfs.c b/sqlite3/vfs.c
index fb67b27..cdc9fe5 100644
--- a/sqlite3/vfs.c
+++ b/sqlite3/vfs.c
@@ -1,3 +1,5 @@
+#include <stdbool.h>
+#include <stddef.h>
 #include <time.h>
 
 #include "sqlite3.h"
diff --git a/vfs/tests/mptest/testdata/main.c b/vfs/tests/mptest/testdata/main.c
index b6ed6e1..4e9688e 100644
--- a/vfs/tests/mptest/testdata/main.c
+++ b/vfs/tests/mptest/testdata/main.c
@@ -1,5 +1,4 @@
-#include <stdbool.h>
-#include <stddef.h>
+#include <unistd.h>
 
 // Amalgamation
 #include "sqlite3.c"
@@ -8,9 +7,8 @@
 
 __attribute__((constructor)) void init() { sqlite3_initialize(); }
 
-static int dont_unlink(const char *pathname) { return 0; }
 #define sqlite3_enable_load_extension(...)
 #define sqlite3_trace(...)
-#define unlink dont_unlink
+#define unlink(...) (0)
 #undef UNUSED_PARAMETER
 #include "mptest.c"
\ No newline at end of file
diff --git a/vfs/tests/speedtest1/testdata/main.c b/vfs/tests/speedtest1/testdata/main.c
index f208fdc..a203a3b 100644
--- a/vfs/tests/speedtest1/testdata/main.c
+++ b/vfs/tests/speedtest1/testdata/main.c
@@ -6,5 +6,5 @@
 // VFS
 #include "vfs.c"
 
-#define randomFunc(args...) randomFunc2(args)
+#define randomFunc randomFunc2
 #include "speedtest1.c"
\ No newline at end of file