SQLite: Check-in [c2ea6293]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Make sure the config.h header is included by ctime.c, if that header exists.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA3-256:	c2ea62937ec8fabec72d3c7cd38d8e2cabbb5ce48638f8ce7ebefd6cd2716fd3
User & Date:	drh 2017-06-24 16:35:00

Context

2017-06-24
19:21		Disable shell tests for the .schema command if virtual tables are not available. check-in: c8186874 user: drh tags: trunk
18:10		Consider the values bound to SQL variables when determining whether or not a partial index may be used. check-in: 7b59c353 user: dan tags: partial-index-variables
16:35		Make sure the config.h header is included by ctime.c, if that header exists. check-in: c2ea6293 user: drh tags: trunk
16:03		Query planner tuning: When deciding between two plans with the same cost, bias the selection toward the one that does not use the sorter. check-in: f0ec36d4 user: drh tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/ctime.c.

    12     12   **
    13     13   ** This file implements routines used to report what compile-time options
    14     14   ** SQLite was built with.
    15     15   */
    16     16   
    17     17   #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
    18     18   
           19  +/*
           20  +** Include the configuration header output by 'configure' if we're using the
           21  +** autoconf-based build
           22  +*/
           23  +#if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
           24  +#include "config.h"
           25  +#define SQLITECONFIG_H 1
           26  +#endif
    19     27   
    20     28   /* These macros are provided to "stringify" the value of the define
    21     29   ** for those options in which the value is meaningful. */
    22     30   #define CTIMEOPT_VAL_(opt) #opt
    23     31   #define CTIMEOPT_VAL(opt) CTIMEOPT_VAL_(opt)
    24     32   
    25     33   /*

Changes to src/sqliteInt.h.

   174    174   */
   175    175   #include "sqlite3.h"
   176    176   
   177    177   /*
   178    178   ** Include the configuration header output by 'configure' if we're using the
   179    179   ** autoconf-based build
   180    180   */
   181         -#ifdef _HAVE_SQLITE_CONFIG_H
          181  +#if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
   182    182   #include "config.h"
          183  +#define SQLITECONFIG_H 1
   183    184   #endif
   184    185   
   185    186   #include "sqliteLimit.h"
   186    187   
   187    188   /* Disable nuisance warnings on Borland compilers */
   188    189   #if defined(__BORLANDC__)
   189    190   #pragma warn -rch /* unreachable code */