Fossil SCM
Change to makeheaders to work around a name collision with MSVC 2008. You will likely need to run "make clean" after updating to this check-in.
Commit
3c69a6fd59acaeaa40e10978f06245fb03c05e8a
Parent
42c2a327e235da6…
2 files changed
-3
+5
-1
-3
| --- src/cgi.c | ||
| +++ src/cgi.c | ||
| @@ -42,13 +42,10 @@ | ||
| 42 | 42 | #endif |
| 43 | 43 | #include <time.h> |
| 44 | 44 | #include <stdio.h> |
| 45 | 45 | #include <stdlib.h> |
| 46 | 46 | #include <unistd.h> |
| 47 | -#if defined (__POCC__) | |
| 48 | -# undef INTERFACE | |
| 49 | -#endif | |
| 50 | 47 | #include "cgi.h" |
| 51 | 48 | |
| 52 | 49 | #if INTERFACE |
| 53 | 50 | /* |
| 54 | 51 | ** Shortcuts for cgi_parameter. P("x") returns the value of query parameter |
| 55 | 52 |
| --- src/cgi.c | |
| +++ src/cgi.c | |
| @@ -42,13 +42,10 @@ | |
| 42 | #endif |
| 43 | #include <time.h> |
| 44 | #include <stdio.h> |
| 45 | #include <stdlib.h> |
| 46 | #include <unistd.h> |
| 47 | #if defined (__POCC__) |
| 48 | # undef INTERFACE |
| 49 | #endif |
| 50 | #include "cgi.h" |
| 51 | |
| 52 | #if INTERFACE |
| 53 | /* |
| 54 | ** Shortcuts for cgi_parameter. P("x") returns the value of query parameter |
| 55 |
| --- src/cgi.c | |
| +++ src/cgi.c | |
| @@ -42,13 +42,10 @@ | |
| 42 | #endif |
| 43 | #include <time.h> |
| 44 | #include <stdio.h> |
| 45 | #include <stdlib.h> |
| 46 | #include <unistd.h> |
| 47 | #include "cgi.h" |
| 48 | |
| 49 | #if INTERFACE |
| 50 | /* |
| 51 | ** Shortcuts for cgi_parameter. P("x") returns the value of query parameter |
| 52 |
+5
-1
| --- src/makeheaders.c | ||
| +++ src/makeheaders.c | ||
| @@ -327,13 +327,17 @@ | ||
| 327 | 327 | |
| 328 | 328 | /* |
| 329 | 329 | ** The following text line appears at the top of every file generated |
| 330 | 330 | ** by this program. By recognizing this line, the program can be sure |
| 331 | 331 | ** never to read a file that it generated itself. |
| 332 | +** | |
| 333 | +** The "#undef INTERFACE" part is a hack to work around a name collision | |
| 334 | +** in MSVC 2008. | |
| 332 | 335 | */ |
| 333 | 336 | const char zTopLine[] = |
| 334 | - "/* \aThis file was automatically generated. Do not edit! */\n"; | |
| 337 | + "/* \aThis file was automatically generated. Do not edit! */\n" | |
| 338 | + "#undef INTERFACE\n"; | |
| 335 | 339 | #define nTopLine (sizeof(zTopLine)-1) |
| 336 | 340 | |
| 337 | 341 | /* |
| 338 | 342 | ** The name of the file currently being parsed. |
| 339 | 343 | */ |
| 340 | 344 |
| --- src/makeheaders.c | |
| +++ src/makeheaders.c | |
| @@ -327,13 +327,17 @@ | |
| 327 | |
| 328 | /* |
| 329 | ** The following text line appears at the top of every file generated |
| 330 | ** by this program. By recognizing this line, the program can be sure |
| 331 | ** never to read a file that it generated itself. |
| 332 | */ |
| 333 | const char zTopLine[] = |
| 334 | "/* \aThis file was automatically generated. Do not edit! */\n"; |
| 335 | #define nTopLine (sizeof(zTopLine)-1) |
| 336 | |
| 337 | /* |
| 338 | ** The name of the file currently being parsed. |
| 339 | */ |
| 340 |
| --- src/makeheaders.c | |
| +++ src/makeheaders.c | |
| @@ -327,13 +327,17 @@ | |
| 327 | |
| 328 | /* |
| 329 | ** The following text line appears at the top of every file generated |
| 330 | ** by this program. By recognizing this line, the program can be sure |
| 331 | ** never to read a file that it generated itself. |
| 332 | ** |
| 333 | ** The "#undef INTERFACE" part is a hack to work around a name collision |
| 334 | ** in MSVC 2008. |
| 335 | */ |
| 336 | const char zTopLine[] = |
| 337 | "/* \aThis file was automatically generated. Do not edit! */\n" |
| 338 | "#undef INTERFACE\n"; |
| 339 | #define nTopLine (sizeof(zTopLine)-1) |
| 340 | |
| 341 | /* |
| 342 | ** The name of the file currently being parsed. |
| 343 | */ |
| 344 |