Fossil SCM

SQLite 3.9.0 beta 2. The first 3.9.0 beta gave compiler errors on some older platforms, which are fixed here. Behold the reason why I check-in SQLite betas into the Fossil trunk.

drh 2015-10-10 14:03 trunk

Commit 0b81254c79df9ae5279cac8e1b9938ec10ea1b96

Parent 9431fec1ea098fe…

2 files changed +8 -5 +1 -1

~ src/sqlite3.c ~ src/sqlite3.h

M src/sqlite3.c

+8 -5

		--- src/sqlite3.c
		+++ src/sqlite3.c
		@@ -325,11 +325,11 @@
325	325	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
326	326	** [sqlite_version()] and [sqlite_source_id()].
327	327	*/
328	328	#define SQLITE_VERSION "3.9.0"
329	329	#define SQLITE_VERSION_NUMBER 3009000
330		-#define SQLITE_SOURCE_ID "2015-10-09 20:40:44 4a47f0177851721cdf6c981df962b6e8862372e7"
	330	+#define SQLITE_SOURCE_ID "2015-10-10 14:00:37 de28acd42f29693341feb884b7223cd3d2b96730"
331	331
332	332	/*
333	333	** CAPI3REF: Run-Time Library Version Numbers
334	334	** KEYWORDS: sqlite3_version, sqlite3_sourceid
335	335	**
		@@ -163584,14 +163584,17 @@
163584	163584	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
163585	163585	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
163586	163586	};
163587	163587	#define safe_isspace(x) (jsonIsSpace[(unsigned char)x])
163588	163588
163589		-/* Unsigned integer types */
163590		-typedef sqlite3_uint64 u64;
163591		-typedef unsigned int u32;
163592		-typedef unsigned char u8;
	163589	+#ifndef SQLITE_AMALGAMATION
	163590	+ /* Unsigned integer types. These are already defined in the sqliteInt.h,
	163591	+ ** but the definitions need to be repeated for separate compilation. */
	163592	+ typedef sqlite3_uint64 u64;
	163593	+ typedef unsigned int u32;
	163594	+ typedef unsigned char u8;
	163595	+#endif
163593	163596
163594	163597	/* Objects */
163595	163598	typedef struct JsonString JsonString;
163596	163599	typedef struct JsonNode JsonNode;
163597	163600	typedef struct JsonParse JsonParse;
163598	163601

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -325,11 +325,11 @@
325	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
326	** [sqlite_version()] and [sqlite_source_id()].
327	*/
328	#define SQLITE_VERSION "3.9.0"
329	#define SQLITE_VERSION_NUMBER 3009000
330	#define SQLITE_SOURCE_ID "2015-10-09 20:40:44 4a47f0177851721cdf6c981df962b6e8862372e7"
331
332	/*
333	** CAPI3REF: Run-Time Library Version Numbers
334	** KEYWORDS: sqlite3_version, sqlite3_sourceid
335	**
	@@ -163584,14 +163584,17 @@
163584	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
163585	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
163586	};
163587	#define safe_isspace(x) (jsonIsSpace[(unsigned char)x])
163588
163589	/* Unsigned integer types */
163590	typedef sqlite3_uint64 u64;
163591	typedef unsigned int u32;
163592	typedef unsigned char u8;



163593
163594	/* Objects */
163595	typedef struct JsonString JsonString;
163596	typedef struct JsonNode JsonNode;
163597	typedef struct JsonParse JsonParse;
163598

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -325,11 +325,11 @@
325	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
326	** [sqlite_version()] and [sqlite_source_id()].
327	*/
328	#define SQLITE_VERSION "3.9.0"
329	#define SQLITE_VERSION_NUMBER 3009000
330	#define SQLITE_SOURCE_ID "2015-10-10 14:00:37 de28acd42f29693341feb884b7223cd3d2b96730"
331
332	/*
333	** CAPI3REF: Run-Time Library Version Numbers
334	** KEYWORDS: sqlite3_version, sqlite3_sourceid
335	**
	@@ -163584,14 +163584,17 @@
163584	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
163585	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
163586	};
163587	#define safe_isspace(x) (jsonIsSpace[(unsigned char)x])
163588
163589	#ifndef SQLITE_AMALGAMATION
163590	/* Unsigned integer types. These are already defined in the sqliteInt.h,
163591	** but the definitions need to be repeated for separate compilation. */
163592	typedef sqlite3_uint64 u64;
163593	typedef unsigned int u32;
163594	typedef unsigned char u8;
163595	#endif
163596
163597	/* Objects */
163598	typedef struct JsonString JsonString;
163599	typedef struct JsonNode JsonNode;
163600	typedef struct JsonParse JsonParse;
163601

M src/sqlite3.h

+1 -1

		--- src/sqlite3.h
		+++ src/sqlite3.h
		@@ -111,11 +111,11 @@
111	111	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
112	112	** [sqlite_version()] and [sqlite_source_id()].
113	113	*/
114	114	#define SQLITE_VERSION "3.9.0"
115	115	#define SQLITE_VERSION_NUMBER 3009000
116		-#define SQLITE_SOURCE_ID "2015-10-09 20:40:44 4a47f0177851721cdf6c981df962b6e8862372e7"
	116	+#define SQLITE_SOURCE_ID "2015-10-10 14:00:37 de28acd42f29693341feb884b7223cd3d2b96730"
117	117
118	118	/*
119	119	** CAPI3REF: Run-Time Library Version Numbers
120	120	** KEYWORDS: sqlite3_version, sqlite3_sourceid
121	121	**
122	122

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -111,11 +111,11 @@
111	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
112	** [sqlite_version()] and [sqlite_source_id()].
113	*/
114	#define SQLITE_VERSION "3.9.0"
115	#define SQLITE_VERSION_NUMBER 3009000
116	#define SQLITE_SOURCE_ID "2015-10-09 20:40:44 4a47f0177851721cdf6c981df962b6e8862372e7"
117
118	/*
119	** CAPI3REF: Run-Time Library Version Numbers
120	** KEYWORDS: sqlite3_version, sqlite3_sourceid
121	**
122

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -111,11 +111,11 @@
111	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
112	** [sqlite_version()] and [sqlite_source_id()].
113	*/
114	#define SQLITE_VERSION "3.9.0"
115	#define SQLITE_VERSION_NUMBER 3009000
116	#define SQLITE_SOURCE_ID "2015-10-10 14:00:37 de28acd42f29693341feb884b7223cd3d2b96730"
117
118	/*
119	** CAPI3REF: Run-Time Library Version Numbers
120	** KEYWORDS: sqlite3_version, sqlite3_sourceid
121	**
122

Fossil SCM

Keyboard Shortcuts