From: drh <drh@noemail.net>
Date: Wed, 27 Apr 2011 18:08:42 +0000 (+0000)
Subject: Change the name of an internal function to avoid conflicts with the math
X-Git-Tag: version-3.7.7~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=840561f2a4972438f4f867b86285efcda7353454;p=thirdparty%2Fsqlite.git

Change the name of an internal function to avoid conflicts with the math
library.

FossilOrigin-Name: 1bd1484cd7e09709d87aa84b82e87597d00a4162
---

diff --git a/manifest b/manifest
index b4059728e0..33d8213904 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expose\sthe\sUTF8\sto\sMBCS\sconversion\sroutine\sin\sos_win.c\sto\sexternal\napplications.
-D 2011-04-27T16:05:42.346
+C Change\sthe\sname\sof\san\sinternal\sfunction\sto\savoid\sconflicts\swith\sthe\smath\nlibrary.
+D 2011-04-27T18:08:42.071
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -133,7 +133,7 @@ F src/delete.c 7a24fcc9a31664d145acb97ce56b6d9f249a25e4
 F src/expr.c e3cf0957c6b8faaaf7386a3bc69e53c0dc9705be
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c a43ba8a005fb5efd1deeee06853e3a6120d46a91
-F src/func.c 6d907d397c9e6eded680f8946499efdf224d34bd
+F src/func.c b9117e40975245b8504cf3625d7e321d8d4b63dc
 F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
 F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@ -930,7 +930,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 19c6625abd5b4e6a4406a8e421ae22527529e305
-R fcd8fa82794547de86a43c56e868f9a6
+P 7b479b9bee93df909edecd44c7d6584d943b39c9
+R 896972878681caa8688ae0b699a33ade
 U drh
-Z f1379103c390c9054c004f3716fc6621
+Z 901a5c52f94c833aabdd9b6dd2fd3b65
diff --git a/manifest.uuid b/manifest.uuid
index 5cdcab0b2d..f22bfc0a4d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7b479b9bee93df909edecd44c7d6584d943b39c9
\ No newline at end of file
+1bd1484cd7e09709d87aa84b82e87597d00a4162
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index e75fa47e7a..0b9b600d79 100644
--- a/src/func.c
+++ b/src/func.c
@@ -779,7 +779,7 @@ static void sourceidFunc(
 ** sqlite3_log().  The return value is NULL.  The function exists purely for
 ** its side-effects.
 */
-static void logFunc(
+static void errlogFunc(
   sqlite3_context *context,
   int argc,
   sqlite3_value **argv
@@ -1556,7 +1556,7 @@ void sqlite3RegisterGlobalFunctions(void){
     FUNCTION(nullif,             2, 0, 1, nullifFunc       ),
     FUNCTION(sqlite_version,     0, 0, 0, versionFunc      ),
     FUNCTION(sqlite_source_id,   0, 0, 0, sourceidFunc     ),
-    FUNCTION(sqlite_log,         2, 0, 0, logFunc          ),
+    FUNCTION(sqlite_log,         2, 0, 0, errlogFunc       ),
 #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
     FUNCTION(sqlite_compileoption_used,1, 0, 0, compileoptionusedFunc  ),
     FUNCTION(sqlite_compileoption_get, 1, 0, 0, compileoptiongetFunc  ),