Fossil SCM
Merge the popen() on windows fix from trunk.
Commit
ef2426dc9eed5743f764212fce8bdd8d58800a7e083251c26942ac5cb54c889d
Parent
e91143e8132cb42…
2 files changed
+7
+7
+7
| --- src/email.c | ||
| +++ src/email.c | ||
| @@ -177,10 +177,17 @@ | ||
| 177 | 177 | k = translateBase64(blob_buffer(pMsg)+i, i+54<n ? 54 : n-i, zBuf); |
| 178 | 178 | blob_append(pOut, zBuf, k); |
| 179 | 179 | blob_append(pOut, "\r\n", 2); |
| 180 | 180 | } |
| 181 | 181 | } |
| 182 | + | |
| 183 | +#if defined(_WIN32) || defined(WIN32) | |
| 184 | +# undef popen | |
| 185 | +# define popen _popen | |
| 186 | +# undef pclose | |
| 187 | +# define pclose _pclose | |
| 188 | +#endif | |
| 182 | 189 | |
| 183 | 190 | /* |
| 184 | 191 | ** Send an email message using whatever sending mechanism is configured |
| 185 | 192 | ** by these settings: |
| 186 | 193 | ** |
| 187 | 194 |
| --- src/email.c | |
| +++ src/email.c | |
| @@ -177,10 +177,17 @@ | |
| 177 | k = translateBase64(blob_buffer(pMsg)+i, i+54<n ? 54 : n-i, zBuf); |
| 178 | blob_append(pOut, zBuf, k); |
| 179 | blob_append(pOut, "\r\n", 2); |
| 180 | } |
| 181 | } |
| 182 | |
| 183 | /* |
| 184 | ** Send an email message using whatever sending mechanism is configured |
| 185 | ** by these settings: |
| 186 | ** |
| 187 |
| --- src/email.c | |
| +++ src/email.c | |
| @@ -177,10 +177,17 @@ | |
| 177 | k = translateBase64(blob_buffer(pMsg)+i, i+54<n ? 54 : n-i, zBuf); |
| 178 | blob_append(pOut, zBuf, k); |
| 179 | blob_append(pOut, "\r\n", 2); |
| 180 | } |
| 181 | } |
| 182 | |
| 183 | #if defined(_WIN32) || defined(WIN32) |
| 184 | # undef popen |
| 185 | # define popen _popen |
| 186 | # undef pclose |
| 187 | # define pclose _pclose |
| 188 | #endif |
| 189 | |
| 190 | /* |
| 191 | ** Send an email message using whatever sending mechanism is configured |
| 192 | ** by these settings: |
| 193 | ** |
| 194 |
+7
| --- src/email.c | ||
| +++ src/email.c | ||
| @@ -177,10 +177,17 @@ | ||
| 177 | 177 | k = translateBase64(blob_buffer(pMsg)+i, i+54<n ? 54 : n-i, zBuf); |
| 178 | 178 | blob_append(pOut, zBuf, k); |
| 179 | 179 | blob_append(pOut, "\r\n", 2); |
| 180 | 180 | } |
| 181 | 181 | } |
| 182 | + | |
| 183 | +#if defined(_WIN32) || defined(WIN32) | |
| 184 | +# undef popen | |
| 185 | +# define popen _popen | |
| 186 | +# undef pclose | |
| 187 | +# define pclose _pclose | |
| 188 | +#endif | |
| 182 | 189 | |
| 183 | 190 | /* |
| 184 | 191 | ** Send an email message using whatever sending mechanism is configured |
| 185 | 192 | ** by these settings: |
| 186 | 193 | ** |
| 187 | 194 |
| --- src/email.c | |
| +++ src/email.c | |
| @@ -177,10 +177,17 @@ | |
| 177 | k = translateBase64(blob_buffer(pMsg)+i, i+54<n ? 54 : n-i, zBuf); |
| 178 | blob_append(pOut, zBuf, k); |
| 179 | blob_append(pOut, "\r\n", 2); |
| 180 | } |
| 181 | } |
| 182 | |
| 183 | /* |
| 184 | ** Send an email message using whatever sending mechanism is configured |
| 185 | ** by these settings: |
| 186 | ** |
| 187 |
| --- src/email.c | |
| +++ src/email.c | |
| @@ -177,10 +177,17 @@ | |
| 177 | k = translateBase64(blob_buffer(pMsg)+i, i+54<n ? 54 : n-i, zBuf); |
| 178 | blob_append(pOut, zBuf, k); |
| 179 | blob_append(pOut, "\r\n", 2); |
| 180 | } |
| 181 | } |
| 182 | |
| 183 | #if defined(_WIN32) || defined(WIN32) |
| 184 | # undef popen |
| 185 | # define popen _popen |
| 186 | # undef pclose |
| 187 | # define pclose _pclose |
| 188 | #endif |
| 189 | |
| 190 | /* |
| 191 | ** Send an email message using whatever sending mechanism is configured |
| 192 | ** by these settings: |
| 193 | ** |
| 194 |