From 4da761773e83ce6d3403e8d0f308d5a9ff761127 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 19 Oct 2024 13:20:34 +0000
Subject: [PATCH] Move the #include of hwtime.h from the bottom of util.c to
 the top of vdbe.c so that it will be available when needed, even for
 non-amalgamation builds.

FossilOrigin-Name: 5f23036a87f443c82fa7fd48fdac16a31128bb9288b71f97228c29bcfeb632fb
---
 manifest      | 16 ++++++++--------
 manifest.uuid |  2 +-
 src/util.c    |  9 ---------
 src/vdbe.c    |  9 +++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/manifest b/manifest
index f47380185f..eae5cf6468 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C An\sassortment\sof\scomment\stypo\sfixes\sdiscovered\sby\saspell.\sAdd\sseveral\snew\swords\sto\stool/custom.txt.\sNo\scode\schanges.
-D 2024-10-19T12:39:06.717
+C Move\sthe\s#include\sof\shwtime.h\sfrom\sthe\sbottom\sof\sutil.c\sto\sthe\stop\sof\nvdbe.c\sso\sthat\sit\swill\sbe\savailable\swhen\sneeded,\seven\sfor\snon-amalgamation\nbuilds.
+D 2024-10-19T13:20:34.419
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -840,9 +840,9 @@ F src/trigger.c 0bb986a5b96047fd597c6aac28588853df56064e576e6b81ba777ef2ccaac461
 F src/update.c 0e01aa6a3edf9ec112b33eb714b9016a81241497b1fb7c3e74332f4f71756508
 F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
 F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba
-F src/util.c 4d57ae861d0e234019be9596818228d7715e44e6efaccb612cf4498bedc2e023
+F src/util.c ceebf912f673247e305f16f97f0bb7285fca1d37413b79680714a553a9021d33
 F src/vacuum.c b763b6457bd058d2072ef9364832351fd8d11e8abf70cbb349657360f7d55c40
-F src/vdbe.c d7558b9aa10611200c1fa562322d4b58fa7ff355225187e025fa07370267b848
+F src/vdbe.c 1f56a0ae24115c2e37213e77cf79aa3b8c8d0366755707385564f6b8dd83d0fb
 F src/vdbe.h c2549a215898a390de6669cfa32adba56f0d7e17ba5a7f7b14506d6fd5f0c36a
 F src/vdbeInt.h af7d7e8291edd0b19f2cd698e60e4d4031078f9a2f2328ac8f0b7efb134f8a1d
 F src/vdbeapi.c 53c7e26a2c0821a892b20eee2cde4656e31998212f3d515576c780dfaa45fd17
@@ -2219,8 +2219,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ad8d4812420e6a5f1cd5c26d2ed07b76e0e3e94596bae4ca59b667a4099bd1cc
-R 76bc48a2bd2097efaca6e1fa5f52aabf
-U stephan
-Z a858937bdfdc5672398d76e7c38e2c32
+P 59b76a99e4a28f4cc8c4f9f39ff6e039c4d29cb7b44183f1902b5792638656d2
+R 93617d58f3cb1733a1670f761c0bfb92
+U drh
+Z 2989e59c9bcd1d88ad7ed1923e84435a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f6ba074833..4406cb5b7a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-59b76a99e4a28f4cc8c4f9f39ff6e039c4d29cb7b44183f1902b5792638656d2
+5f23036a87f443c82fa7fd48fdac16a31128bb9288b71f97228c29bcfeb632fb
diff --git a/src/util.c b/src/util.c
index 9ad294016a..52c2a744ca 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1846,12 +1846,3 @@ int sqlite3VListNameToNum(VList *pIn, const char *zName, int nName){
   }while( i<mx );
   return 0;
 }
-
-/*
-** High-resolution hardware timer used for debugging and testing only.
-*/
-#if defined(VDBE_PROFILE)  \
- || defined(SQLITE_PERFORMANCE_TRACE) \
- || defined(SQLITE_ENABLE_STMT_SCANSTATUS)
-# include "hwtime.h"
-#endif
diff --git a/src/vdbe.c b/src/vdbe.c
index 4cb1efd1db..eb61b4d299 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -21,6 +21,15 @@
 #include "sqliteInt.h"
 #include "vdbeInt.h"
 
+/*
+** High-resolution hardware timer used for debugging and testing only.
+*/
+#if defined(VDBE_PROFILE)  \
+ || defined(SQLITE_PERFORMANCE_TRACE) \
+ || defined(SQLITE_ENABLE_STMT_SCANSTATUS)
+# include "hwtime.h"
+#endif
+
 /*
 ** Invoke this macro on memory cells just prior to changing the
 ** value of the cell.  This macro verifies that shallow copies are