Fossil SCM
(cherry-pick): Fix the build on MSVC.
Commit
83a359ff397f8b5e411401d93572f75d916e46a4
Parent
c24373934dc19c0…
3 files changed
+1
-1
+1
-1
+2
-1
M
VERSION
+1
-1
| --- VERSION | ||
| +++ VERSION | ||
| @@ -1,1 +1,1 @@ | ||
| 1 | -1.36 | |
| 1 | +1.36.1 | |
| 2 | 2 |
| --- VERSION | |
| +++ VERSION | |
| @@ -1,1 +1,1 @@ | |
| 1 | 1.36 |
| 2 |
| --- VERSION | |
| +++ VERSION | |
| @@ -1,1 +1,1 @@ | |
| 1 | 1.36.1 |
| 2 |
M
VERSION
+1
-1
| --- VERSION | ||
| +++ VERSION | ||
| @@ -1,1 +1,1 @@ | ||
| 1 | -1.36 | |
| 1 | +1.36.1 | |
| 2 | 2 |
| --- VERSION | |
| +++ VERSION | |
| @@ -1,1 +1,1 @@ | |
| 1 | 1.36 |
| 2 |
| --- VERSION | |
| +++ VERSION | |
| @@ -1,1 +1,1 @@ | |
| 1 | 1.36.1 |
| 2 |
+2
-1
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -546,12 +546,13 @@ | ||
| 546 | 546 | Blob *pTicket, /* The text of the ticket change record */ |
| 547 | 547 | const char *zTktId, /* The ticket to which this change is applied */ |
| 548 | 548 | int needMod /* True if moderation is needed */ |
| 549 | 549 | ){ |
| 550 | 550 | int result; |
| 551 | + int rid; | |
| 551 | 552 | manifest_crosslink_begin(); |
| 552 | - int rid = content_put_ex(pTicket, 0, 0, 0, needMod); | |
| 553 | + rid = content_put_ex(pTicket, 0, 0, 0, needMod); | |
| 553 | 554 | if( rid==0 ){ |
| 554 | 555 | fossil_fatal("trouble committing ticket: %s", g.zErrMsg); |
| 555 | 556 | } |
| 556 | 557 | if( needMod ){ |
| 557 | 558 | moderation_table_create(); |
| 558 | 559 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -546,12 +546,13 @@ | |
| 546 | Blob *pTicket, /* The text of the ticket change record */ |
| 547 | const char *zTktId, /* The ticket to which this change is applied */ |
| 548 | int needMod /* True if moderation is needed */ |
| 549 | ){ |
| 550 | int result; |
| 551 | manifest_crosslink_begin(); |
| 552 | int rid = content_put_ex(pTicket, 0, 0, 0, needMod); |
| 553 | if( rid==0 ){ |
| 554 | fossil_fatal("trouble committing ticket: %s", g.zErrMsg); |
| 555 | } |
| 556 | if( needMod ){ |
| 557 | moderation_table_create(); |
| 558 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -546,12 +546,13 @@ | |
| 546 | Blob *pTicket, /* The text of the ticket change record */ |
| 547 | const char *zTktId, /* The ticket to which this change is applied */ |
| 548 | int needMod /* True if moderation is needed */ |
| 549 | ){ |
| 550 | int result; |
| 551 | int rid; |
| 552 | manifest_crosslink_begin(); |
| 553 | rid = content_put_ex(pTicket, 0, 0, 0, needMod); |
| 554 | if( rid==0 ){ |
| 555 | fossil_fatal("trouble committing ticket: %s", g.zErrMsg); |
| 556 | } |
| 557 | if( needMod ){ |
| 558 | moderation_table_create(); |
| 559 |