Fossil SCM
Yet another shell.c import from SQLite to deal with more typedef issues.
Commit
f0e625b1aa6a81ab321f61c6f635d4e104a2cae6db087a2bb1db835dacbe1011
Parent
25799e8930258c2…
3 files changed
+4
-2
+1
-1
+1
-1
+4
-2
| --- extsrc/shell.c | ||
| +++ extsrc/shell.c | ||
| @@ -32,10 +32,12 @@ | ||
| 32 | 32 | */ |
| 33 | 33 | #if (defined(_WIN32) || defined(WIN32)) && !defined(_CRT_SECURE_NO_WARNINGS) |
| 34 | 34 | /* This needs to come before any includes for MSVC compiler */ |
| 35 | 35 | #define _CRT_SECURE_NO_WARNINGS |
| 36 | 36 | #endif |
| 37 | +typedef unsigned int u32; | |
| 38 | +typedef unsigned short int u16; | |
| 37 | 39 | |
| 38 | 40 | /* |
| 39 | 41 | ** Optionally #include a user-defined header, whereby compilation options |
| 40 | 42 | ** may be set prior to where they take effect, but after platform setup. |
| 41 | 43 | ** If SQLITE_CUSTOM_INCLUDE=? is defined, its value names the #include |
| @@ -6891,12 +6893,12 @@ | ||
| 6891 | 6893 | # define UINT16_TYPE unsigned short int |
| 6892 | 6894 | # endif |
| 6893 | 6895 | #endif |
| 6894 | 6896 | /* typedef sqlite3_int64 i64; */ |
| 6895 | 6897 | /* typedef unsigned char u8; */ |
| 6896 | -typedef UINT32_TYPE u32; /* 4-byte unsigned integer */ | |
| 6897 | -typedef UINT16_TYPE u16; /* 2-byte unsigned integer */ | |
| 6898 | +/* typedef UINT32_TYPE u32; // 4-byte unsigned integer // */ | |
| 6899 | +/* typedef UINT16_TYPE u16; // 2-byte unsigned integer // */ | |
| 6898 | 6900 | #define MIN(a,b) ((a)<(b) ? (a) : (b)) |
| 6899 | 6901 | |
| 6900 | 6902 | #if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST) |
| 6901 | 6903 | # define SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS 1 |
| 6902 | 6904 | #endif |
| 6903 | 6905 |
| --- extsrc/shell.c | |
| +++ extsrc/shell.c | |
| @@ -32,10 +32,12 @@ | |
| 32 | */ |
| 33 | #if (defined(_WIN32) || defined(WIN32)) && !defined(_CRT_SECURE_NO_WARNINGS) |
| 34 | /* This needs to come before any includes for MSVC compiler */ |
| 35 | #define _CRT_SECURE_NO_WARNINGS |
| 36 | #endif |
| 37 | |
| 38 | /* |
| 39 | ** Optionally #include a user-defined header, whereby compilation options |
| 40 | ** may be set prior to where they take effect, but after platform setup. |
| 41 | ** If SQLITE_CUSTOM_INCLUDE=? is defined, its value names the #include |
| @@ -6891,12 +6893,12 @@ | |
| 6891 | # define UINT16_TYPE unsigned short int |
| 6892 | # endif |
| 6893 | #endif |
| 6894 | /* typedef sqlite3_int64 i64; */ |
| 6895 | /* typedef unsigned char u8; */ |
| 6896 | typedef UINT32_TYPE u32; /* 4-byte unsigned integer */ |
| 6897 | typedef UINT16_TYPE u16; /* 2-byte unsigned integer */ |
| 6898 | #define MIN(a,b) ((a)<(b) ? (a) : (b)) |
| 6899 | |
| 6900 | #if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST) |
| 6901 | # define SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS 1 |
| 6902 | #endif |
| 6903 |
| --- extsrc/shell.c | |
| +++ extsrc/shell.c | |
| @@ -32,10 +32,12 @@ | |
| 32 | */ |
| 33 | #if (defined(_WIN32) || defined(WIN32)) && !defined(_CRT_SECURE_NO_WARNINGS) |
| 34 | /* This needs to come before any includes for MSVC compiler */ |
| 35 | #define _CRT_SECURE_NO_WARNINGS |
| 36 | #endif |
| 37 | typedef unsigned int u32; |
| 38 | typedef unsigned short int u16; |
| 39 | |
| 40 | /* |
| 41 | ** Optionally #include a user-defined header, whereby compilation options |
| 42 | ** may be set prior to where they take effect, but after platform setup. |
| 43 | ** If SQLITE_CUSTOM_INCLUDE=? is defined, its value names the #include |
| @@ -6891,12 +6893,12 @@ | |
| 6893 | # define UINT16_TYPE unsigned short int |
| 6894 | # endif |
| 6895 | #endif |
| 6896 | /* typedef sqlite3_int64 i64; */ |
| 6897 | /* typedef unsigned char u8; */ |
| 6898 | /* typedef UINT32_TYPE u32; // 4-byte unsigned integer // */ |
| 6899 | /* typedef UINT16_TYPE u16; // 2-byte unsigned integer // */ |
| 6900 | #define MIN(a,b) ((a)<(b) ? (a) : (b)) |
| 6901 | |
| 6902 | #if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST) |
| 6903 | # define SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS 1 |
| 6904 | #endif |
| 6905 |
+1
-1
| --- extsrc/sqlite3.c | ||
| +++ extsrc/sqlite3.c | ||
| @@ -452,11 +452,11 @@ | ||
| 452 | 452 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 453 | 453 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 454 | 454 | */ |
| 455 | 455 | #define SQLITE_VERSION "3.40.0" |
| 456 | 456 | #define SQLITE_VERSION_NUMBER 3040000 |
| 457 | -#define SQLITE_SOURCE_ID "2022-11-07 18:36:02 3645585f37631d60cefab1d55cdb1ee060aae87317b9b158a01329ca8a4d3e1e" | |
| 457 | +#define SQLITE_SOURCE_ID "2022-11-07 19:40:20 55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0" | |
| 458 | 458 | |
| 459 | 459 | /* |
| 460 | 460 | ** CAPI3REF: Run-Time Library Version Numbers |
| 461 | 461 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 462 | 462 | ** |
| 463 | 463 |
| --- extsrc/sqlite3.c | |
| +++ extsrc/sqlite3.c | |
| @@ -452,11 +452,11 @@ | |
| 452 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 453 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 454 | */ |
| 455 | #define SQLITE_VERSION "3.40.0" |
| 456 | #define SQLITE_VERSION_NUMBER 3040000 |
| 457 | #define SQLITE_SOURCE_ID "2022-11-07 18:36:02 3645585f37631d60cefab1d55cdb1ee060aae87317b9b158a01329ca8a4d3e1e" |
| 458 | |
| 459 | /* |
| 460 | ** CAPI3REF: Run-Time Library Version Numbers |
| 461 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 462 | ** |
| 463 |
| --- extsrc/sqlite3.c | |
| +++ extsrc/sqlite3.c | |
| @@ -452,11 +452,11 @@ | |
| 452 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 453 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 454 | */ |
| 455 | #define SQLITE_VERSION "3.40.0" |
| 456 | #define SQLITE_VERSION_NUMBER 3040000 |
| 457 | #define SQLITE_SOURCE_ID "2022-11-07 19:40:20 55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0" |
| 458 | |
| 459 | /* |
| 460 | ** CAPI3REF: Run-Time Library Version Numbers |
| 461 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 462 | ** |
| 463 |
+1
-1
| --- extsrc/sqlite3.h | ||
| +++ extsrc/sqlite3.h | ||
| @@ -146,11 +146,11 @@ | ||
| 146 | 146 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 147 | 147 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 148 | 148 | */ |
| 149 | 149 | #define SQLITE_VERSION "3.40.0" |
| 150 | 150 | #define SQLITE_VERSION_NUMBER 3040000 |
| 151 | -#define SQLITE_SOURCE_ID "2022-11-07 18:36:02 3645585f37631d60cefab1d55cdb1ee060aae87317b9b158a01329ca8a4d3e1e" | |
| 151 | +#define SQLITE_SOURCE_ID "2022-11-07 19:40:20 55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0" | |
| 152 | 152 | |
| 153 | 153 | /* |
| 154 | 154 | ** CAPI3REF: Run-Time Library Version Numbers |
| 155 | 155 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 156 | 156 | ** |
| 157 | 157 |
| --- extsrc/sqlite3.h | |
| +++ extsrc/sqlite3.h | |
| @@ -146,11 +146,11 @@ | |
| 146 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 147 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 148 | */ |
| 149 | #define SQLITE_VERSION "3.40.0" |
| 150 | #define SQLITE_VERSION_NUMBER 3040000 |
| 151 | #define SQLITE_SOURCE_ID "2022-11-07 18:36:02 3645585f37631d60cefab1d55cdb1ee060aae87317b9b158a01329ca8a4d3e1e" |
| 152 | |
| 153 | /* |
| 154 | ** CAPI3REF: Run-Time Library Version Numbers |
| 155 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 156 | ** |
| 157 |
| --- extsrc/sqlite3.h | |
| +++ extsrc/sqlite3.h | |
| @@ -146,11 +146,11 @@ | |
| 146 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 147 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 148 | */ |
| 149 | #define SQLITE_VERSION "3.40.0" |
| 150 | #define SQLITE_VERSION_NUMBER 3040000 |
| 151 | #define SQLITE_SOURCE_ID "2022-11-07 19:40:20 55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0" |
| 152 | |
| 153 | /* |
| 154 | ** CAPI3REF: Run-Time Library Version Numbers |
| 155 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 156 | ** |
| 157 |