Fix for bug 217538 . Fix NSS sqlite build on OS/2 . r=rrelyea
git-svn-id: svn://10.0.0.236/trunk@228566 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
05c7c30533
commit
e09c265118
@ -35,7 +35,7 @@
|
||||
** This header file defines the interface that the SQLite library
|
||||
** presents to client programs.
|
||||
**
|
||||
** @(#) $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** @(#) $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
#ifndef _SQLITE3_H_
|
||||
#define _SQLITE3_H_
|
||||
@ -1927,7 +1927,7 @@ int sqlite3_overload_function(sqlite3*, const char *zFuncName, int nArg);
|
||||
** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
|
||||
** All other code has file scope.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
**
|
||||
** NOTES:
|
||||
**
|
||||
@ -1973,7 +1973,7 @@ int sqlite3_overload_function(sqlite3*, const char *zFuncName, int nArg);
|
||||
*************************************************************************
|
||||
** Internal interface definitions for SQLite.
|
||||
**
|
||||
** @(#) $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** @(#) $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
#ifndef _SQLITEINT_H_
|
||||
#define _SQLITEINT_H_
|
||||
@ -2032,7 +2032,7 @@ int sqlite3_overload_function(sqlite3*, const char *zFuncName, int nArg);
|
||||
** This is the header file for the generic hash-table implemenation
|
||||
** used in SQLite.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
#ifndef _SQLITE_HASH_H_
|
||||
#define _SQLITE_HASH_H_
|
||||
@ -2493,7 +2493,7 @@ struct BusyHandler {
|
||||
** or VDBE. The VDBE implements an abstract machine that runs a
|
||||
** simple program to access and modify the underlying database.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
#ifndef _SQLITE_VDBE_H_
|
||||
#define _SQLITE_VDBE_H_
|
||||
@ -2809,7 +2809,7 @@ void sqlite3VdbeSwap(Vdbe*,Vdbe*);
|
||||
** subsystem. See comments in the source code for a detailed description
|
||||
** of what each interface routine does.
|
||||
**
|
||||
** @(#) $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** @(#) $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
#ifndef _BTREE_H_
|
||||
#define _BTREE_H_
|
||||
@ -2964,7 +2964,7 @@ int sqlite3BtreePageDump(Btree*, int, int recursive);
|
||||
** subsystem. The page cache subsystem reads and writes a file a page
|
||||
** at a time and provides a journal for rollback.
|
||||
**
|
||||
** @(#) $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** @(#) $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
#ifndef _PAGER_H_
|
||||
@ -4866,6 +4866,7 @@ extern void (*sqlite3_io_trace)(const char*,...);
|
||||
# define INCL_DOSERRORS
|
||||
# define INCL_DOSMISC
|
||||
# define INCL_DOSPROCESS
|
||||
# define INCL_DOSMODULEMGR
|
||||
# include <os2.h>
|
||||
# define SQLITE_TEMPNAME_SIZE (CCHMAXPATHCOMP)
|
||||
#else
|
||||
@ -7291,7 +7292,7 @@ void sqlite3DebugPrintf(const char *zFormat, ...){
|
||||
** Random numbers are used by some of the database backends in order
|
||||
** to generate random integer keys for tables or random filenames.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -7389,7 +7390,7 @@ void sqlite3Randomness(int N, void *pBuf){
|
||||
** This file contains routines used to translate between UTF-8,
|
||||
** UTF-16, UTF-16BE, and UTF-16LE.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
**
|
||||
** Notes on UTF-8:
|
||||
**
|
||||
@ -8431,7 +8432,7 @@ void sqlite3utfSelfTest(){
|
||||
** This file contains functions for allocating memory, comparing
|
||||
** strings, and stuff like that.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -9924,7 +9925,7 @@ void sqlite3MallocAllow(){
|
||||
** This is the implementation of generic hash-tables
|
||||
** used in SQLite.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/* Turn bulk memory into a hash table object by initializing the
|
||||
@ -16790,7 +16791,7 @@ ThreadData *sqlite3WinThreadSpecificData(int allocateFlag){
|
||||
** file simultaneously, or one process from reading the database while
|
||||
** another is writing.
|
||||
**
|
||||
** @(#) $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** @(#) $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
#ifndef SQLITE_OMIT_DISKIO
|
||||
|
||||
@ -21102,7 +21103,7 @@ void sqlite3PagerRefdump(Pager *pPager){
|
||||
** May you share freely, never taking more than you give.
|
||||
**
|
||||
*************************************************************************
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
**
|
||||
** This file implements a external (disk-based) database using BTrees.
|
||||
** For a detailed discussion of BTrees, refer to
|
||||
@ -31849,7 +31850,7 @@ sqlite3 *sqlite3_db_handle(sqlite3_stmt *pStmt){
|
||||
** in this file for details. If in doubt, do not deviate from existing
|
||||
** commenting and indentation practices when changing or adding code.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -36856,7 +36857,7 @@ abort_due_to_interrupt:
|
||||
** This file contains routines used for analyzing expressions and
|
||||
** for generating VDBE code that evaluates expressions in SQLite.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -39294,7 +39295,7 @@ int sqlite3ExprAnalyzeAggList(NameContext *pNC, ExprList *pList){
|
||||
** This file contains C code routines that used to generate VDBE code
|
||||
** that implements the ALTER TABLE command.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -39869,7 +39870,7 @@ exit_begin_add_column:
|
||||
*************************************************************************
|
||||
** This file contains code associated with the ANALYZE command.
|
||||
**
|
||||
** @(#) $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** @(#) $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
#ifndef SQLITE_OMIT_ANALYZE
|
||||
|
||||
@ -40274,7 +40275,7 @@ void sqlite3AnalysisLoad(sqlite3 *db, int iDb){
|
||||
*************************************************************************
|
||||
** This file contains code used to implement the ATTACH and DETACH commands.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
#ifndef SQLITE_OMIT_ATTACH
|
||||
@ -40788,7 +40789,7 @@ int sqlite3FixTriggerStep(
|
||||
** systems that do not need this facility may omit it by recompiling
|
||||
** the library with -DSQLITE_OMIT_AUTHORIZATION=1
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -41032,7 +41033,7 @@ void sqlite3AuthContextPop(AuthContext *pContext){
|
||||
** COMMIT
|
||||
** ROLLBACK
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -44375,7 +44376,7 @@ KeyInfo *sqlite3IndexKeyinfo(Parse *pParse, Index *pIdx){
|
||||
** This file contains functions used to access the internal hash tables
|
||||
** of user defined functions and collation sequences.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -44753,7 +44754,7 @@ Schema *sqlite3SchemaGet(Btree *pBt){
|
||||
** separating it out, the code will be automatically omitted from
|
||||
** static links that do not use it.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
#ifndef SQLITE_OMIT_COMPLETE
|
||||
|
||||
@ -45014,7 +45015,7 @@ int sqlite3_complete16(const void *zSql){
|
||||
** This file contains C code routines that are called by the parser
|
||||
** in order to generate code for DELETE FROM statements.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -45487,7 +45488,7 @@ void sqlite3GenerateIndexKey(
|
||||
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
|
||||
** All other code has file scope.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
/* #include <math.h> */
|
||||
|
||||
@ -46825,7 +46826,7 @@ int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){
|
||||
** This file contains C code routines that are called by the parser
|
||||
** to handle INSERT statements in SQLite.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -48413,7 +48414,7 @@ static int xferOptimization(
|
||||
** other files are for internal use by SQLite and should not be
|
||||
** accessed by users of the library.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -48564,7 +48565,7 @@ exec_out:
|
||||
** as extensions by SQLite should #include this file instead of
|
||||
** sqlite3.h.
|
||||
**
|
||||
** @(#) $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** @(#) $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
#ifndef _SQLITE3EXT_H_
|
||||
#define _SQLITE3EXT_H_
|
||||
@ -49266,7 +49267,7 @@ int sqlite3AutoLoadExtensions(sqlite3 *db){
|
||||
*************************************************************************
|
||||
** This file contains code used to implement the PRAGMA command.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/* Ignore this whole file if pragmas are disabled
|
||||
@ -50335,7 +50336,7 @@ pragma_out:
|
||||
** interface, and routines that contribute to loading the database schema
|
||||
** from disk.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -51025,7 +51026,7 @@ int sqlite3_prepare16_v2(
|
||||
** This file contains C code routines that are called by the parser
|
||||
** to handle SELECT statements in SQLite.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -55456,7 +55457,7 @@ int sqlite3CodeRowTrigger(
|
||||
** This file contains C code routines that are called by the parser
|
||||
** to handle UPDATE statements.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
#ifndef SQLITE_OMIT_VIRTUALTABLE
|
||||
@ -56086,7 +56087,7 @@ static void updateVirtualTable(
|
||||
** Most of the code in this file may be omitted by defining the
|
||||
** SQLITE_OMIT_VACUUM macro.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
|
||||
@ -56345,7 +56346,7 @@ end_of_vacuum:
|
||||
*************************************************************************
|
||||
** This file contains code used to help implement virtual tables.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
#ifndef SQLITE_OMIT_VIRTUALTABLE
|
||||
|
||||
@ -57067,7 +57068,7 @@ FuncDef *sqlite3VtabOverloadFunction(
|
||||
** so is applicable. Because this module is responsible for selecting
|
||||
** indices, you might also think of this module as the "query optimizer".
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -62912,7 +62913,7 @@ void sqlite3Parser(
|
||||
** individual tokens and sends those tokens one-by-one over to the
|
||||
** parser for analysis.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -62965,7 +62966,7 @@ const unsigned char ebcdicToAscii[] = {
|
||||
**
|
||||
** The code in this file has been automatically generated by
|
||||
**
|
||||
** $Header: /home/befator/cvs/jail/cvsroot/mozilla/security/nss/lib/sqlite/sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Header: /home/befator/cvs/jail/cvsroot/mozilla/security/nss/lib/sqlite/sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
**
|
||||
** The code in this file implements a function that determines whether
|
||||
** or not a given identifier is really an SQL keyword. The same thing
|
||||
@ -63532,7 +63533,7 @@ abort_parse:
|
||||
** other files are for internal use by SQLite and should not be
|
||||
** accessed by users of the library.
|
||||
**
|
||||
** $Id: sqlite3.c,v 1.3 2007-06-13 02:20:00 rrelyea%redhat.com Exp $
|
||||
** $Id: sqlite3.c,v 1.4 2007-06-22 01:30:16 julien.pierre.bugs%sun.com Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user