diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-08-29 06:12:06 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-08-29 06:12:06 +0000 |
| commit | 7a0cbd5e5715d715c3fddfaace2f800ef820d328 (patch) | |
| tree | 4f6b5042db1bbe7c1d262ec4eecbb8936a6a0f1f /systemv/cupstestppd.c | |
| parent | ee6ddad2570bbfe4ac3c3378b8765532b6d7cde5 (diff) | |
| download | cups-7a0cbd5e5715d715c3fddfaace2f800ef820d328.tar.gz | |
Import changes from CUPS 1.4.1 (r8801)
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1649 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'systemv/cupstestppd.c')
| -rw-r--r-- | systemv/cupstestppd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index f3c8bb66d..dda0f0e75 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -50,6 +50,9 @@ #include <errno.h> #include <stdlib.h> #include <math.h> +#ifdef WIN32 +# define X_OK 0 +#endif /* WIN32 */ /* @@ -1541,7 +1544,7 @@ main(int argc, /* I - Number of command-line args */ for (j = 0, group = ppd->groups; j < ppd->num_groups; j ++, group ++) for (k = 0, option = group->options; k < group->num_options; k ++, option ++) { - len = strlen(option->keyword); + len = (int)strlen(option->keyword); for (m = 0, group2 = ppd->groups; m < ppd->num_groups; @@ -1550,7 +1553,7 @@ main(int argc, /* I - Number of command-line args */ n < group2->num_options; n ++, option2 ++) if (option != option2 && - len < strlen(option2->keyword) && + len < (int)strlen(option2->keyword) && !strncmp(option->keyword, option2->keyword, len)) { _cupsLangPrintf(stdout, @@ -3070,7 +3073,7 @@ check_translations(ppd_file_t *ppd, /* I - PPD file */ language; language = (char *)cupsArrayNext(languages)) { - langlen = strlen(language); + langlen = (int)strlen(language); if (langlen != 2 && langlen != 5) { if (!warn && !errors && !verbose) |