Fossil SCM
Added missing #ifdefs for json mode.
Commit
d92aad29191c291f68f705be2be31c80885d9cd5
Parent
5b131851006f6d9…
2 files changed
+3
-1
+3
-1
+3
-1
| --- src/report.c | ||
| +++ src/report.c | ||
| @@ -19,11 +19,13 @@ | ||
| 19 | 19 | */ |
| 20 | 20 | #include "config.h" |
| 21 | 21 | #include <time.h> |
| 22 | 22 | #include "report.h" |
| 23 | 23 | #include <assert.h> |
| 24 | -#include "cson_amalgamation.h" | |
| 24 | +#ifdef FOSSIL_ENABLE_JSON | |
| 25 | +# include "cson_amalgamation.h" | |
| 26 | +#endif | |
| 25 | 27 | |
| 26 | 28 | /* Forward references to static routines */ |
| 27 | 29 | static void report_format_hints(void); |
| 28 | 30 | |
| 29 | 31 | /* |
| 30 | 32 |
| --- src/report.c | |
| +++ src/report.c | |
| @@ -19,11 +19,13 @@ | |
| 19 | */ |
| 20 | #include "config.h" |
| 21 | #include <time.h> |
| 22 | #include "report.h" |
| 23 | #include <assert.h> |
| 24 | #include "cson_amalgamation.h" |
| 25 | |
| 26 | /* Forward references to static routines */ |
| 27 | static void report_format_hints(void); |
| 28 | |
| 29 | /* |
| 30 |
| --- src/report.c | |
| +++ src/report.c | |
| @@ -19,11 +19,13 @@ | |
| 19 | */ |
| 20 | #include "config.h" |
| 21 | #include <time.h> |
| 22 | #include "report.h" |
| 23 | #include <assert.h> |
| 24 | #ifdef FOSSIL_ENABLE_JSON |
| 25 | # include "cson_amalgamation.h" |
| 26 | #endif |
| 27 | |
| 28 | /* Forward references to static routines */ |
| 29 | static void report_format_hints(void); |
| 30 | |
| 31 | /* |
| 32 |
+3
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -20,11 +20,13 @@ | ||
| 20 | 20 | */ |
| 21 | 21 | #include <string.h> |
| 22 | 22 | #include <time.h> |
| 23 | 23 | #include "config.h" |
| 24 | 24 | #include "timeline.h" |
| 25 | -#include "cson_amalgamation.h" | |
| 25 | +#ifdef FOSSIL_ENABLE_JSON | |
| 26 | +# include "cson_amalgamation.h" | |
| 27 | +#endif | |
| 26 | 28 | |
| 27 | 29 | /* |
| 28 | 30 | ** Shorten a UUID so that is the minimum length needed to contain |
| 29 | 31 | ** at least one digit in the range 'a'..'f'. The minimum length is 10. |
| 30 | 32 | */ |
| 31 | 33 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -20,11 +20,13 @@ | |
| 20 | */ |
| 21 | #include <string.h> |
| 22 | #include <time.h> |
| 23 | #include "config.h" |
| 24 | #include "timeline.h" |
| 25 | #include "cson_amalgamation.h" |
| 26 | |
| 27 | /* |
| 28 | ** Shorten a UUID so that is the minimum length needed to contain |
| 29 | ** at least one digit in the range 'a'..'f'. The minimum length is 10. |
| 30 | */ |
| 31 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -20,11 +20,13 @@ | |
| 20 | */ |
| 21 | #include <string.h> |
| 22 | #include <time.h> |
| 23 | #include "config.h" |
| 24 | #include "timeline.h" |
| 25 | #ifdef FOSSIL_ENABLE_JSON |
| 26 | # include "cson_amalgamation.h" |
| 27 | #endif |
| 28 | |
| 29 | /* |
| 30 | ** Shorten a UUID so that is the minimum length needed to contain |
| 31 | ** at least one digit in the range 'a'..'f'. The minimum length is 10. |
| 32 | */ |
| 33 |