Fossil SCM
Simplify the declaration of common TH1 related configuration settings.
Commit
52ed68109b232fdd94c182f3ed6e9c996a0644f8
Parent
037ccb47c59bab0…
1 file changed
+10
-3
+10
-3
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -41,10 +41,17 @@ | ||
| 41 | 41 | #define CONFIGSET_ALL 0x0000ff /* Everything */ |
| 42 | 42 | |
| 43 | 43 | #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */ |
| 44 | 44 | #define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */ |
| 45 | 45 | |
| 46 | +/* | |
| 47 | +** This mask is used for the common TH1 configuration settings (i.e. those | |
| 48 | +** that are not specific to one particular subsystem, such as the transfer | |
| 49 | +** subsystem). | |
| 50 | +*/ | |
| 51 | +#define CONFIGSET_TH1 (CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER) | |
| 52 | + | |
| 46 | 53 | #endif /* INTERFACE */ |
| 47 | 54 | |
| 48 | 55 | /* |
| 49 | 56 | ** Names of the configuration sets |
| 50 | 57 | */ |
| @@ -90,15 +97,15 @@ | ||
| 90 | 97 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 91 | 98 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 92 | 99 | { "adunit", CONFIGSET_SKIN }, |
| 93 | 100 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 94 | 101 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 95 | - { "th1-setup", CONFIGSET_ALL }, | |
| 102 | + { "th1-setup", CONFIGSET_TH1 }, | |
| 96 | 103 | |
| 97 | 104 | #ifdef FOSSIL_ENABLE_TCL |
| 98 | - { "tcl", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER }, | |
| 99 | - { "tcl-setup", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER }, | |
| 105 | + { "tcl", CONFIGSET_TH1 }, | |
| 106 | + { "tcl-setup", CONFIGSET_TH1 }, | |
| 100 | 107 | #endif |
| 101 | 108 | |
| 102 | 109 | { "project-name", CONFIGSET_PROJ }, |
| 103 | 110 | { "short-project-name", CONFIGSET_PROJ }, |
| 104 | 111 | { "project-description", CONFIGSET_PROJ }, |
| 105 | 112 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -41,10 +41,17 @@ | |
| 41 | #define CONFIGSET_ALL 0x0000ff /* Everything */ |
| 42 | |
| 43 | #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */ |
| 44 | #define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */ |
| 45 | |
| 46 | #endif /* INTERFACE */ |
| 47 | |
| 48 | /* |
| 49 | ** Names of the configuration sets |
| 50 | */ |
| @@ -90,15 +97,15 @@ | |
| 90 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 91 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 92 | { "adunit", CONFIGSET_SKIN }, |
| 93 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 94 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 95 | { "th1-setup", CONFIGSET_ALL }, |
| 96 | |
| 97 | #ifdef FOSSIL_ENABLE_TCL |
| 98 | { "tcl", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER }, |
| 99 | { "tcl-setup", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER }, |
| 100 | #endif |
| 101 | |
| 102 | { "project-name", CONFIGSET_PROJ }, |
| 103 | { "short-project-name", CONFIGSET_PROJ }, |
| 104 | { "project-description", CONFIGSET_PROJ }, |
| 105 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -41,10 +41,17 @@ | |
| 41 | #define CONFIGSET_ALL 0x0000ff /* Everything */ |
| 42 | |
| 43 | #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */ |
| 44 | #define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */ |
| 45 | |
| 46 | /* |
| 47 | ** This mask is used for the common TH1 configuration settings (i.e. those |
| 48 | ** that are not specific to one particular subsystem, such as the transfer |
| 49 | ** subsystem). |
| 50 | */ |
| 51 | #define CONFIGSET_TH1 (CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER) |
| 52 | |
| 53 | #endif /* INTERFACE */ |
| 54 | |
| 55 | /* |
| 56 | ** Names of the configuration sets |
| 57 | */ |
| @@ -90,15 +97,15 @@ | |
| 97 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 98 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 99 | { "adunit", CONFIGSET_SKIN }, |
| 100 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 101 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 102 | { "th1-setup", CONFIGSET_TH1 }, |
| 103 | |
| 104 | #ifdef FOSSIL_ENABLE_TCL |
| 105 | { "tcl", CONFIGSET_TH1 }, |
| 106 | { "tcl-setup", CONFIGSET_TH1 }, |
| 107 | #endif |
| 108 | |
| 109 | { "project-name", CONFIGSET_PROJ }, |
| 110 | { "short-project-name", CONFIGSET_PROJ }, |
| 111 | { "project-description", CONFIGSET_PROJ }, |
| 112 |