Fossil SCM
Fix for _popen and _pclose with Visual C++ in the new export.c module.
Commit
931da0c3e37913ea382b8ce7cca9057a6a20c741cb7ca0d04432c5ce5429923b
Parent
f153777f3efcf65…
1 file changed
+7
+7
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -37,10 +37,17 @@ | ||
| 37 | 37 | char *name; /* Name of the mark. Also starts with ":" */ |
| 38 | 38 | int rid; /* Corresponding object in the BLOB table */ |
| 39 | 39 | char uuid[65]; /* The GIT hash name for this object */ |
| 40 | 40 | }; |
| 41 | 41 | #endif |
| 42 | + | |
| 43 | +#if defined(_WIN32) || defined(WIN32) | |
| 44 | +# undef popen | |
| 45 | +# define popen _popen | |
| 46 | +# undef pclose | |
| 47 | +# define pclose _pclose | |
| 48 | +#endif | |
| 42 | 49 | |
| 43 | 50 | /* |
| 44 | 51 | ** Output a "committer" record for the given user. |
| 45 | 52 | ** NOTE: the given user name may be an email itself. |
| 46 | 53 | */ |
| 47 | 54 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -37,10 +37,17 @@ | |
| 37 | char *name; /* Name of the mark. Also starts with ":" */ |
| 38 | int rid; /* Corresponding object in the BLOB table */ |
| 39 | char uuid[65]; /* The GIT hash name for this object */ |
| 40 | }; |
| 41 | #endif |
| 42 | |
| 43 | /* |
| 44 | ** Output a "committer" record for the given user. |
| 45 | ** NOTE: the given user name may be an email itself. |
| 46 | */ |
| 47 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -37,10 +37,17 @@ | |
| 37 | char *name; /* Name of the mark. Also starts with ":" */ |
| 38 | int rid; /* Corresponding object in the BLOB table */ |
| 39 | char uuid[65]; /* The GIT hash name for this object */ |
| 40 | }; |
| 41 | #endif |
| 42 | |
| 43 | #if defined(_WIN32) || defined(WIN32) |
| 44 | # undef popen |
| 45 | # define popen _popen |
| 46 | # undef pclose |
| 47 | # define pclose _pclose |
| 48 | #endif |
| 49 | |
| 50 | /* |
| 51 | ** Output a "committer" record for the given user. |
| 52 | ** NOTE: the given user name may be an email itself. |
| 53 | */ |
| 54 |