diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2021-07-25 06:22:24 +0930 |
|---|---|---|
| committer | Adrian Johnson <ajohnson@redneon.com> | 2021-07-25 11:02:55 +0930 |
| commit | 8d14a20a0009a8e832cb87fd9cf829bd399aa692 (patch) | |
| tree | adaac939b7003405175e7a87ab739129fff12fb0 | |
| parent | 9fbf42754899898934bc8bf4f8eeacba37656fdc (diff) | |
| download | cairo-8d14a20a0009a8e832cb87fd9cf829bd399aa692.tar.gz | |
Fix some win32 compile warnings
| -rw-r--r-- | perf/cairo-perf-report.c | 5 | ||||
| -rw-r--r-- | src/cairo-compiler-private.h | 1 | ||||
| -rw-r--r-- | src/cairo-ft-font.c | 2 | ||||
| -rw-r--r-- | src/cairo-misc.c | 3 | ||||
| -rw-r--r-- | src/cairo-svg-surface.c | 1 |
5 files changed, 11 insertions, 1 deletions
diff --git a/perf/cairo-perf-report.c b/perf/cairo-perf-report.c index 5a1e25441..64a680242 100644 --- a/perf/cairo-perf-report.c +++ b/perf/cairo-perf-report.c @@ -45,10 +45,12 @@ #endif #ifdef _MSC_VER +#if _MSC_VER < 1800 static long long strtoll (const char *nptr, char **endptr, int base); +#endif static char * basename (char *path); @@ -221,6 +223,8 @@ test_report_parse (test_report_t *report, * The basename function is fully compliant to its GNU specs. */ #ifdef _MSC_VER + +#if _MSC_VER < 1800 long long strtoll (const char *nptr, char **endptr, @@ -228,6 +232,7 @@ strtoll (const char *nptr, { return _atoi64(nptr); } +#endif static char * basename (char *path) diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h index 00703c584..e95658105 100644 --- a/src/cairo-compiler-private.h +++ b/src/cairo-compiler-private.h @@ -195,6 +195,7 @@ #if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER) #define access _access +#define R_OK 0 #define fdopen _fdopen #define hypot _hypot #define pclose _pclose diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index fca24b3cd..2adc979bc 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -69,7 +69,7 @@ #if HAVE_UNISTD_H #include <unistd.h> -#else +#elif !defined(access) #define access(p, m) 0 #endif diff --git a/src/cairo-misc.c b/src/cairo-misc.c index bd1f30627..3dc1570b5 100644 --- a/src/cairo-misc.c +++ b/src/cairo-misc.c @@ -404,6 +404,7 @@ _cairo_operator_bounded_by_mask (cairo_operator_t op) return FALSE; default: ASSERT_NOT_REACHED; + return FALSE; /* squelch warning */ } } @@ -458,6 +459,7 @@ _cairo_operator_bounded_by_source (cairo_operator_t op) return FALSE; default: ASSERT_NOT_REACHED; + return FALSE; /* squelch warning */ } } @@ -499,6 +501,7 @@ _cairo_operator_bounded_by_either (cairo_operator_t op) return 0; default: ASSERT_NOT_REACHED; + return FALSE; /* squelch warning */ } } diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c index 8baeecfc2..6d5572cd8 100644 --- a/src/cairo-svg-surface.c +++ b/src/cairo-svg-surface.c @@ -1731,6 +1731,7 @@ _cairo_svg_surface_emit_static_filter (cairo_svg_document_t *document, enum cair return "color-to-alpha"; default: ASSERT_NOT_REACHED; + return FALSE; /* squelch warning */ } } |