Fossil SCM
Fix compiler warning seen with MSVC.
Commit
2dbc71549647541c2df249841924e509efb4416183b9bfc38a3d86a8118ab29f
Parent
e57dc731a9fe2f1…
1 file changed
+4
+4
| --- src/json_detail.h | ||
| +++ src/json_detail.h | ||
| @@ -16,11 +16,13 @@ | ||
| 16 | 16 | ** [email protected] |
| 17 | 17 | ** http://www.hwaci.com/drh/ |
| 18 | 18 | ** |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | +#if !defined(_RC_COMPILE_) | |
| 21 | 22 | #include "cson_amalgamation.h" |
| 23 | +#endif /* !defined(_RC_COMPILE_) */ | |
| 22 | 24 | |
| 23 | 25 | /** |
| 24 | 26 | FOSSIL_JSON_API_VERSION holds the date (YYYYMMDD) of the latest |
| 25 | 27 | "significant" change to the JSON API (a change in an interface or |
| 26 | 28 | new functionality). It is sent as part of the /json/version |
| @@ -53,10 +55,11 @@ | ||
| 53 | 55 | ** Maintenance reminder: when entries are added to this list, update |
| 54 | 56 | ** the code in json_page_resultCodes() and json_err_cstr() (both in |
| 55 | 57 | ** json.c)! |
| 56 | 58 | ** |
| 57 | 59 | */ |
| 60 | +#if !defined(_RC_COMPILE_) | |
| 58 | 61 | enum FossilJsonCodes { |
| 59 | 62 | FSL_JSON_W_START = 0, |
| 60 | 63 | FSL_JSON_W_UNKNOWN /*+1*/, |
| 61 | 64 | FSL_JSON_W_ROW_TO_JSON_FAILED /*+2*/, |
| 62 | 65 | FSL_JSON_W_COL_TO_JSON_FAILED /*+3*/, |
| @@ -263,7 +266,8 @@ | ||
| 263 | 266 | |
| 264 | 267 | enum json_get_changed_files_flags { |
| 265 | 268 | json_get_changed_files_ELIDE_PARENT = 1 << 0 |
| 266 | 269 | }; |
| 267 | 270 | |
| 271 | +#endif /* !defined(_RC_COMPILE_) */ | |
| 268 | 272 | #endif/*FOSSIL_JSON_DETAIL_H_INCLUDED*/ |
| 269 | 273 | #endif /* FOSSIL_ENABLE_JSON */ |
| 270 | 274 |
| --- src/json_detail.h | |
| +++ src/json_detail.h | |
| @@ -16,11 +16,13 @@ | |
| 16 | ** [email protected] |
| 17 | ** http://www.hwaci.com/drh/ |
| 18 | ** |
| 19 | */ |
| 20 | |
| 21 | #include "cson_amalgamation.h" |
| 22 | |
| 23 | /** |
| 24 | FOSSIL_JSON_API_VERSION holds the date (YYYYMMDD) of the latest |
| 25 | "significant" change to the JSON API (a change in an interface or |
| 26 | new functionality). It is sent as part of the /json/version |
| @@ -53,10 +55,11 @@ | |
| 53 | ** Maintenance reminder: when entries are added to this list, update |
| 54 | ** the code in json_page_resultCodes() and json_err_cstr() (both in |
| 55 | ** json.c)! |
| 56 | ** |
| 57 | */ |
| 58 | enum FossilJsonCodes { |
| 59 | FSL_JSON_W_START = 0, |
| 60 | FSL_JSON_W_UNKNOWN /*+1*/, |
| 61 | FSL_JSON_W_ROW_TO_JSON_FAILED /*+2*/, |
| 62 | FSL_JSON_W_COL_TO_JSON_FAILED /*+3*/, |
| @@ -263,7 +266,8 @@ | |
| 263 | |
| 264 | enum json_get_changed_files_flags { |
| 265 | json_get_changed_files_ELIDE_PARENT = 1 << 0 |
| 266 | }; |
| 267 | |
| 268 | #endif/*FOSSIL_JSON_DETAIL_H_INCLUDED*/ |
| 269 | #endif /* FOSSIL_ENABLE_JSON */ |
| 270 |
| --- src/json_detail.h | |
| +++ src/json_detail.h | |
| @@ -16,11 +16,13 @@ | |
| 16 | ** [email protected] |
| 17 | ** http://www.hwaci.com/drh/ |
| 18 | ** |
| 19 | */ |
| 20 | |
| 21 | #if !defined(_RC_COMPILE_) |
| 22 | #include "cson_amalgamation.h" |
| 23 | #endif /* !defined(_RC_COMPILE_) */ |
| 24 | |
| 25 | /** |
| 26 | FOSSIL_JSON_API_VERSION holds the date (YYYYMMDD) of the latest |
| 27 | "significant" change to the JSON API (a change in an interface or |
| 28 | new functionality). It is sent as part of the /json/version |
| @@ -53,10 +55,11 @@ | |
| 55 | ** Maintenance reminder: when entries are added to this list, update |
| 56 | ** the code in json_page_resultCodes() and json_err_cstr() (both in |
| 57 | ** json.c)! |
| 58 | ** |
| 59 | */ |
| 60 | #if !defined(_RC_COMPILE_) |
| 61 | enum FossilJsonCodes { |
| 62 | FSL_JSON_W_START = 0, |
| 63 | FSL_JSON_W_UNKNOWN /*+1*/, |
| 64 | FSL_JSON_W_ROW_TO_JSON_FAILED /*+2*/, |
| 65 | FSL_JSON_W_COL_TO_JSON_FAILED /*+3*/, |
| @@ -263,7 +266,8 @@ | |
| 266 | |
| 267 | enum json_get_changed_files_flags { |
| 268 | json_get_changed_files_ELIDE_PARENT = 1 << 0 |
| 269 | }; |
| 270 | |
| 271 | #endif /* !defined(_RC_COMPILE_) */ |
| 272 | #endif/*FOSSIL_JSON_DETAIL_H_INCLUDED*/ |
| 273 | #endif /* FOSSIL_ENABLE_JSON */ |
| 274 |