Fossil SCM
Fix compilation issue on Unix due to 'mkindex' wrongly attempting to include 'cmd_win32_service' due to its #if processing.
Commit
69f64a8d64722e0e8ac7c9e673c03a49228ec1eb
Parent
7aeeb30286cc2f6…
1 file changed
+4
-2
+4
-2
| --- src/winhttp.c | ||
| +++ src/winhttp.c | ||
| @@ -666,11 +666,12 @@ | ||
| 666 | 666 | } |
| 667 | 667 | } |
| 668 | 668 | return 0; |
| 669 | 669 | } |
| 670 | 670 | |
| 671 | -/* dupe ifdef needed for mkindex | |
| 671 | +#ifdef _WIN32 /* dupe needed for mkindex */ | |
| 672 | +/* | |
| 672 | 673 | ** COMMAND: winsrv* |
| 673 | 674 | ** |
| 674 | 675 | ** Usage: %fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS? |
| 675 | 676 | ** |
| 676 | 677 | ** Where METHOD is one of: create delete show start stop. |
| @@ -1115,6 +1116,7 @@ | ||
| 1115 | 1116 | fossil_fatal("METHOD should be one of:" |
| 1116 | 1117 | " create delete show start stop"); |
| 1117 | 1118 | } |
| 1118 | 1119 | return; |
| 1119 | 1120 | } |
| 1120 | -#endif /* _WIN32 -- This code is for win32 only */ | |
| 1121 | +#endif /* _WIN32 -- dupe needed for mkindex */ | |
| 1122 | +#endif /* _WIN32 -- This code is for win32 only */ | |
| 1121 | 1123 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -666,11 +666,12 @@ | |
| 666 | } |
| 667 | } |
| 668 | return 0; |
| 669 | } |
| 670 | |
| 671 | /* dupe ifdef needed for mkindex |
| 672 | ** COMMAND: winsrv* |
| 673 | ** |
| 674 | ** Usage: %fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS? |
| 675 | ** |
| 676 | ** Where METHOD is one of: create delete show start stop. |
| @@ -1115,6 +1116,7 @@ | |
| 1115 | fossil_fatal("METHOD should be one of:" |
| 1116 | " create delete show start stop"); |
| 1117 | } |
| 1118 | return; |
| 1119 | } |
| 1120 | #endif /* _WIN32 -- This code is for win32 only */ |
| 1121 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -666,11 +666,12 @@ | |
| 666 | } |
| 667 | } |
| 668 | return 0; |
| 669 | } |
| 670 | |
| 671 | #ifdef _WIN32 /* dupe needed for mkindex */ |
| 672 | /* |
| 673 | ** COMMAND: winsrv* |
| 674 | ** |
| 675 | ** Usage: %fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS? |
| 676 | ** |
| 677 | ** Where METHOD is one of: create delete show start stop. |
| @@ -1115,6 +1116,7 @@ | |
| 1116 | fossil_fatal("METHOD should be one of:" |
| 1117 | " create delete show start stop"); |
| 1118 | } |
| 1119 | return; |
| 1120 | } |
| 1121 | #endif /* _WIN32 -- dupe needed for mkindex */ |
| 1122 | #endif /* _WIN32 -- This code is for win32 only */ |
| 1123 |