Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Minor change to main.c so that it will compile with GCC 2.96. (CVS 1325) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
1a09a1ada199b76926c64bd79ad39d6d |
| User & Date: | drh 2004-05-08 10:11:37 |
Context
|
2004-05-08
| ||
| 10:56 | Get the code back to the point where it will compile the btree.c tests. Move the default key comparison routine from btree.c into vdbeaux.c. Commented out code in vdbe.c that will need to be fixed. (CVS 1326) (check-in: 2bca9224 user: drh tags: trunk) | |
| 10:11 | Minor change to main.c so that it will compile with GCC 2.96. (CVS 1325) (check-in: 1a09a1ad user: drh tags: trunk) | |
| 08:23 | Change lots of internal symbols from sqliteXXX to sqlite3XXX so that the library links again. It doesn't work yet, due to changes in the btree layer calling convention. (CVS 1324) (check-in: 8af6474c user: danielk1977 tags: trunk) | |
Changes
Changes to src/main.c.
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 .... 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 .... 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 |
** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** ** $Id: main.c,v 1.165 2004/05/08 08:23:26 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> /* ** A pointer to this structure is used to communicate information ................................................................................ int sqlite3BtreeFactory( const sqlite *db, /* Main database when opening aux otherwise 0 */ const char *zFilename, /* Name of the file containing the BTree database */ int omitJournal, /* if TRUE then do not journal this file */ int nCache, /* How many pages in the page cache */ Btree **ppBtree /* Pointer to new Btree object written here */ ){ assert( ppBtree != 0); int btree_flags = 0; if( omitJournal ){ btree_flags |= BTREE_OMIT_JOURNAL; } if( !zFilename ){ btree_flags |= BTREE_MEMORY; } ................................................................................ long long int sqlite3_column_int(sqlite3_stmt*,int){ } double sqlite3_column_float(sqlite3_stmt*,int){ } #endif |
| < > < < < |
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 .... 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 .... 1338 1339 1340 1341 1342 1343 1344 |
** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** ** $Id: main.c,v 1.166 2004/05/08 10:11:37 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> /* ** A pointer to this structure is used to communicate information ................................................................................ int sqlite3BtreeFactory( const sqlite *db, /* Main database when opening aux otherwise 0 */ const char *zFilename, /* Name of the file containing the BTree database */ int omitJournal, /* if TRUE then do not journal this file */ int nCache, /* How many pages in the page cache */ Btree **ppBtree /* Pointer to new Btree object written here */ ){ int btree_flags = 0; assert( ppBtree != 0); if( omitJournal ){ btree_flags |= BTREE_OMIT_JOURNAL; } if( !zFilename ){ btree_flags |= BTREE_MEMORY; } ................................................................................ long long int sqlite3_column_int(sqlite3_stmt*,int){ } double sqlite3_column_float(sqlite3_stmt*,int){ } #endif |