Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Don't try and include common.h on stand-alone amalgamation builds (CVS 4830) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | 9898320be05cdbe78dac799f3fef34dc |
| User & Date: | mlcreech 2008-03-06 09:16:24 |
Context
|
2008-03-06
| ||
| 09:19 | Typo in amalgamation non-x86 builds (CVS 4831) check-in: a8424e06 user: mlcreech tags: trunk | |
| 09:16 | Don't try and include common.h on stand-alone amalgamation builds (CVS 4830) check-in: 9898320b user: mlcreech tags: trunk | |
| 09:03 | Remove amalgamation on "make clean" (fixes #2559) (CVS 4829) check-in: e03802f3 user: mlcreech tags: trunk | |
Changes
Changes to Makefile.in.
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 |
#
BCC = @BUILD_CC@ @BUILD_CFLAGS@
# C Compile and options for use in building executables that
# will run on the target platform. (BCC and TCC are usually the
# same unless your are cross-compiling.)
#
TCC = @CC@ @CPPFLAGS@ @CFLAGS@ -I. -I${TOP}/src
# Define -DNDEBUG to compile without debugging (i.e., for production usage)
# Omitting the define will cause extra debugging code to be inserted and
# includes extra comments when "EXPLAIN stmt" is used.
#
TCC += @TARGET_DEBUG@ @XTHREADCONNECT@
|
| |
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 |
#
BCC = @BUILD_CC@ @BUILD_CFLAGS@
# C Compile and options for use in building executables that
# will run on the target platform. (BCC and TCC are usually the
# same unless your are cross-compiling.)
#
TCC = @CC@ @CPPFLAGS@ @CFLAGS@ -I. -I${TOP}/src -DSQLITE_STANDARD_BUILD=1
# Define -DNDEBUG to compile without debugging (i.e., for production usage)
# Omitting the define will cause extra debugging code to be inserted and
# includes extra comments when "EXPLAIN stmt" is used.
#
TCC += @TARGET_DEBUG@ @XTHREADCONNECT@
|
Changes to src/sqliteInt.h.
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 |
** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Internal interface definitions for SQLite. ** ** @(#) $Id: sqliteInt.h,v 1.666 2008/03/06 07:19:20 mlcreech Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ #include "common.h" /* ** The macro unlikely() is a hint that surrounds a boolean ** expression that is usually false. Macro likely() surrounds ** a boolean expression that is usually true. GCC is able to ** use these hints to generate better code, sometimes. */ |
| > > > > > > |
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 |
** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Internal interface definitions for SQLite. ** ** @(#) $Id: sqliteInt.h,v 1.667 2008/03/06 09:16:24 mlcreech Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ /* ** Do not try to include this file when building the amalgamation outside of ** the SQLite source tree. */ #ifdef SQLITE_STANDARD_BUILD #include "common.h" #endif /* ** The macro unlikely() is a hint that surrounds a boolean ** expression that is usually false. Macro likely() surrounds ** a boolean expression that is usually true. GCC is able to ** use these hints to generate better code, sometimes. */ |