"extern" prototypes cause problems for the Digital Mars compiler. So

remove them.  Ticket #2502. (CVS 4156)

FossilOrigin-Name: f35fbf8070d770a603960b2a2afdeae91574ed5f

diff --git a/manifest b/manifest
index b60d42cb7e1cb9cab26147d476cc7df52266823b..a3ba2fa2df7518624e0191e7c3d24d268e05fe61 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\s#2497.\sSet\sthe\sdatabase\serror\scode\sto\sthe\sreturn\svalue\sof\ssqlite3_step().\s(CVS\s4155)
-D 2007-07-12T13:18:05
+C "extern"\sprototypes\scause\sproblems\sfor\sthe\sDigital\sMars\scompiler.\s\sSo\nremove\sthem.\s\sTicket\s#2502.\s(CVS\s4156)
+D 2007-07-13T10:26:08
 F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -132,7 +132,7 @@ F src/test_md5.c 6c42bc0a3c0b54be34623ff77a0eec32b2fa96e3
 F src/test_schema.c 89c526e4b1e9a8fb540550f6ebc69242bf57d3ce
 F src/test_server.c 76c0baf509abe65ca6e5c7974ab0097cfdd8b833
 F src/test_tclvar.c ea4500a60d663f7fdf18fd3210efc112e0c6e7f0
-F src/tokenize.c 6cef9e6fc454d789a32c5b509ccb193a2b01977b
+F src/tokenize.c 0f0955ef7b8ab99ba2d3099faa89b80ccba3733a
 F src/trigger.c 420192efe3e6f03addf7897c60c3c8bf913d3493
 F src/update.c 6b10becb6235ea314ed245fbfbf8b38755e3166e
 F src/utf.c 01b2aba02b10d12903e9e1ff897215c9faf6b662
@@ -517,7 +517,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 22277b7e1b3eb1678280de5d49a6613908ab4bff
-R 7e19a26312fedbc76cc4476fc4b0d610
-U danielk1977
-Z 6fcb0fb38adb79f9452cc83afe715eb3
+P b01fda5f50e40b6122faf169c44486bde7ffe16c
+R d29cc33e8e2ed440772d23db662e8ae5
+U drh
+Z 4291f69b8652e32f9a933f1e37282a3c

diff --git a/manifest.uuid b/manifest.uuid
index 24ab7d7d914c07a663c62acde270d4d2bfd1d1a4..ac2807cb90114ece0e4265bb9fcdc740c15215f1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b01fda5f50e40b6122faf169c44486bde7ffe16c
\ No newline at end of file
+f35fbf8070d770a603960b2a2afdeae91574ed5f
\ No newline at end of file

diff --git a/src/tokenize.c b/src/tokenize.c
index b5a7f8580eb9221d6856da4f22dc7a95bad5fc5c..a0a57a177b9f7eba5607f67764400e56f688075b 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.129 2007/05/15 14:34:32 drh Exp $
+** $Id: tokenize.c,v 1.130 2007/07/13 10:26:08 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -380,6 +380,13 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
   return getToken(z, tokenType);
 }
 
+/*
+** The interface to the LEMON-generated parser
+*/
+void *sqlite3ParserAlloc(void*(*)(size_t));
+void sqlite3ParserFree(void*, void(*)(void*));
+void sqlite3Parser(void*, int, Token, Parse*);
+
 /*
 ** Run the parser on the given SQL string.  The parser structure is
 ** passed in.  An SQLITE_ status code is returned.  If an error occurs
@@ -394,9 +401,6 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
   int tokenType;
   int lastTokenParsed = -1;
   sqlite3 *db = pParse->db;
-  extern void *sqlite3ParserAlloc(void*(*)(size_t));
-  extern void sqlite3ParserFree(void*, void(*)(void*));
-  extern void sqlite3Parser(void*, int, Token, Parse*);
 
   if( db->activeVdbeCnt==0 ){
     db->u1.isInterrupted = 0;