Fossil SCM
Resolved a g.th1Flags bitmask collision between TH_STATE_xxx and TH_INIT_NO_ENCODE.
Commit
0dc3a65515974dfd03087be922a1ae3e4e803467cb4e8e901d80afb97c4082a0
Parent
0a57df7e07759dc…
1 file changed
+3
-3
+3
-3
| --- src/th_main.c | ||
| +++ src/th_main.c | ||
| @@ -46,13 +46,13 @@ | ||
| 46 | 46 | |
| 47 | 47 | /* |
| 48 | 48 | ** Flags set by functions in this file to keep track of integration state |
| 49 | 49 | ** information. These flags should not be used outside of this file. |
| 50 | 50 | */ |
| 51 | -#define TH_STATE_CONFIG ((u32)0x00000020) /* We opened the config. */ | |
| 52 | -#define TH_STATE_REPOSITORY ((u32)0x00000040) /* We opened the repository. */ | |
| 53 | -#define TH_STATE_MASK ((u32)0x00000060) /* All possible state flags. */ | |
| 51 | +#define TH_STATE_CONFIG ((u32)0x00000200) /* We opened the config. */ | |
| 52 | +#define TH_STATE_REPOSITORY ((u32)0x00000400) /* We opened the repository. */ | |
| 53 | +#define TH_STATE_MASK ((u32)0x00000600) /* All possible state flags. */ | |
| 54 | 54 | |
| 55 | 55 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 56 | 56 | /* |
| 57 | 57 | ** These are the "well-known" TH1 error messages that occur when no hook is |
| 58 | 58 | ** registered to be called prior to executing a command or processing a web |
| 59 | 59 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -46,13 +46,13 @@ | |
| 46 | |
| 47 | /* |
| 48 | ** Flags set by functions in this file to keep track of integration state |
| 49 | ** information. These flags should not be used outside of this file. |
| 50 | */ |
| 51 | #define TH_STATE_CONFIG ((u32)0x00000020) /* We opened the config. */ |
| 52 | #define TH_STATE_REPOSITORY ((u32)0x00000040) /* We opened the repository. */ |
| 53 | #define TH_STATE_MASK ((u32)0x00000060) /* All possible state flags. */ |
| 54 | |
| 55 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 56 | /* |
| 57 | ** These are the "well-known" TH1 error messages that occur when no hook is |
| 58 | ** registered to be called prior to executing a command or processing a web |
| 59 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -46,13 +46,13 @@ | |
| 46 | |
| 47 | /* |
| 48 | ** Flags set by functions in this file to keep track of integration state |
| 49 | ** information. These flags should not be used outside of this file. |
| 50 | */ |
| 51 | #define TH_STATE_CONFIG ((u32)0x00000200) /* We opened the config. */ |
| 52 | #define TH_STATE_REPOSITORY ((u32)0x00000400) /* We opened the repository. */ |
| 53 | #define TH_STATE_MASK ((u32)0x00000600) /* All possible state flags. */ |
| 54 | |
| 55 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 56 | /* |
| 57 | ** These are the "well-known" TH1 error messages that occur when no hook is |
| 58 | ** registered to be called prior to executing a command or processing a web |
| 59 |