The MinGW.org Installation Manager Tool
リビジョン | 407f363791d735213699af2dfd585048af90443f (tree) |
---|---|
日時 | 2013-05-31 21:26:50 |
作者 | Keith Marshall <keithmarshall@user...> |
コミッター | Keith Marshall |
Avoid a potential macro definition conflict.
@@ -1,3 +1,9 @@ | ||
1 | +2013-05-31 Keith Marshall <keithmarshall@users.sourceforge.net> | |
2 | + | |
3 | + Avoid a potential macro definition conflict. | |
4 | + | |
5 | + * src/pkgbase.h (strcasecmp) [__MINGW32__]: Use string.h definition. | |
6 | + | |
1 | 7 | 2013-05-15 Keith Marshall <keithmarshall@users.sourceforge.net> |
2 | 8 | |
3 | 9 | Streamline build-time dependency tracking procedures. |
@@ -527,10 +527,14 @@ bool safe_strcmp( strcmp_function strcmp, const char *value, const char *proto ) | ||
527 | 527 | # ifndef CASE_INSENSITIVE_FILESYSTEM |
528 | 528 | # define CASE_INSENSITIVE_FILESYSTEM 1 |
529 | 529 | # endif |
530 | +# ifndef __MINGW32__ | |
530 | 531 | /* The preferred name for MS-Windows' case insensitive string |
531 | - * matching function, equivalent to POSIX strcasecmp(). | |
532 | + * matching function, equivalent to POSIX strcasecmp(); MinGW's | |
533 | + * string.h will have established this mapping already, so we | |
534 | + * don't introduce a (possibly incompatible) redefinition. | |
532 | 535 | */ |
533 | -# define strcasecmp stricmp | |
536 | +# define strcasecmp _stricmp | |
537 | +# endif | |
534 | 538 | #else |
535 | 539 | /* On other systems, we prefer to adopt case sensitive matching |
536 | 540 | * strategies for subsystem and file names. |