Fossil SCM
Removed a Windows/Cygwin-only #if guard around blob_add_cr() because it's now optionally used by mini-commit.
Commit
f8c18060470d017641be4047263a994a581d28f1a0b9706812266a6c859112b9
Parent
0a0d96dd42db6dd…
1 file changed
-2
-2
| --- src/blob.c | ||
| +++ src/blob.c | ||
| @@ -1167,11 +1167,10 @@ | ||
| 1167 | 1167 | blob_reset(&b3); |
| 1168 | 1168 | } |
| 1169 | 1169 | fossil_print("ok\n"); |
| 1170 | 1170 | } |
| 1171 | 1171 | |
| 1172 | -#if defined(_WIN32) || defined(__CYGWIN__) | |
| 1173 | 1172 | /* |
| 1174 | 1173 | ** Convert every \n character in the given blob into \r\n. |
| 1175 | 1174 | */ |
| 1176 | 1175 | void blob_add_cr(Blob *p){ |
| 1177 | 1176 | char *z = p->aData; |
| @@ -1191,11 +1190,10 @@ | ||
| 1191 | 1190 | if( (z[--j] = z[--i]) =='\n' ){ |
| 1192 | 1191 | z[--j] = '\r'; |
| 1193 | 1192 | } |
| 1194 | 1193 | } |
| 1195 | 1194 | } |
| 1196 | -#endif | |
| 1197 | 1195 | |
| 1198 | 1196 | /* |
| 1199 | 1197 | ** Remove every \r character from the given blob, replacing each one with |
| 1200 | 1198 | ** a \n character if it was not already part of a \r\n pair. |
| 1201 | 1199 | */ |
| 1202 | 1200 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -1167,11 +1167,10 @@ | |
| 1167 | blob_reset(&b3); |
| 1168 | } |
| 1169 | fossil_print("ok\n"); |
| 1170 | } |
| 1171 | |
| 1172 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 1173 | /* |
| 1174 | ** Convert every \n character in the given blob into \r\n. |
| 1175 | */ |
| 1176 | void blob_add_cr(Blob *p){ |
| 1177 | char *z = p->aData; |
| @@ -1191,11 +1190,10 @@ | |
| 1191 | if( (z[--j] = z[--i]) =='\n' ){ |
| 1192 | z[--j] = '\r'; |
| 1193 | } |
| 1194 | } |
| 1195 | } |
| 1196 | #endif |
| 1197 | |
| 1198 | /* |
| 1199 | ** Remove every \r character from the given blob, replacing each one with |
| 1200 | ** a \n character if it was not already part of a \r\n pair. |
| 1201 | */ |
| 1202 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -1167,11 +1167,10 @@ | |
| 1167 | blob_reset(&b3); |
| 1168 | } |
| 1169 | fossil_print("ok\n"); |
| 1170 | } |
| 1171 | |
| 1172 | /* |
| 1173 | ** Convert every \n character in the given blob into \r\n. |
| 1174 | */ |
| 1175 | void blob_add_cr(Blob *p){ |
| 1176 | char *z = p->aData; |
| @@ -1191,11 +1190,10 @@ | |
| 1190 | if( (z[--j] = z[--i]) =='\n' ){ |
| 1191 | z[--j] = '\r'; |
| 1192 | } |
| 1193 | } |
| 1194 | } |
| 1195 | |
| 1196 | /* |
| 1197 | ** Remove every \r character from the given blob, replacing each one with |
| 1198 | ** a \n character if it was not already part of a \r\n pair. |
| 1199 | */ |
| 1200 |