SQLite

Check-in [9a54935917]
Login

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

Overview
Comment:Fix a merge problem in main.mk
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA3-256: 9a54935917e6e2a5f4b2537f48b7da4bc4efd6167b1ab39e6a56cb89002e9d2d
User & Date: drh 2018-10-11 16:28:44.252
Context
2018-10-11
17:05
Merge compiler warning fixes and the codec enhancement from trunk. (check-in: f9fa58e1d1 user: drh tags: apple-osx)
16:28
Fix a merge problem in main.mk (check-in: 9a54935917 user: drh tags: apple-osx)
14:07
Remove surplus code in geopoly.c that seems to have come from a bad merge. (check-in: c486a63c33 user: drh tags: apple-osx)
Changes
Unified Diff Ignore Whitespace Patch
Changes to main.mk.
︙︙
462
463
464
465
466
467
468

469
470
471
472
473
474
475

   $(TOP)/src/vdbe.h \
   $(TOP)/src/vdbeInt.h \
   $(TOP)/src/vxworks.h \
   $(TOP)/src/whereInt.h

# Header files used by extensions
#

  $(TOP)/ext/fts1/fts1.h \
  $(TOP)/ext/fts1/fts1_hash.h \
  $(TOP)/ext/fts1/fts1_tokenizer.h
EXTHDR += \
  $(TOP)/ext/fts2/fts2.h \
  $(TOP)/ext/fts2/fts2_hash.h \
  $(TOP)/ext/fts2/fts2_tokenizer.h








>








462
463
464
465
466
467
468
469
470
471
472
473
474
475
476

   $(TOP)/src/vdbe.h \
   $(TOP)/src/vdbeInt.h \
   $(TOP)/src/vxworks.h \
   $(TOP)/src/whereInt.h

# Header files used by extensions
#
EXTHDR += \
  $(TOP)/ext/fts1/fts1.h \
  $(TOP)/ext/fts1/fts1_hash.h \
  $(TOP)/ext/fts1/fts1_tokenizer.h
EXTHDR += \
  $(TOP)/ext/fts2/fts2.h \
  $(TOP)/ext/fts2/fts2_hash.h \
  $(TOP)/ext/fts2/fts2_tokenizer.h
︙︙