diff options
| author | Patrik Nyblom <[email protected]> | 2013-01-25 21:44:48 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-01-25 21:44:48 +0100 |
| commit | debbee7ddf7b356f10f1dc12c874ed6e80c02c20 (patch) | |
| tree | 42464367c52bb177cb037faa2faec70673a0fe34 /erts/emulator/drivers | |
| parent | 725618258bdd33e25e5a156f6774832054a6af9a (diff) | |
| parent | 90b44f551fd3d988b34a9fb7d32598b789a0c546 (diff) | |
| download | otp-debbee7ddf7b356f10f1dc12c874ed6e80c02c20.tar.gz otp-debbee7ddf7b356f10f1dc12c874ed6e80c02c20.tar.bz2 otp-debbee7ddf7b356f10f1dc12c874ed6e80c02c20.zip | |
Merge branch 'pan/fix-compiler-warnings-clang-and-new-gcc'
* pan/fix-compiler-warnings-clang-and-new-gcc:
Fix compiler warnings from GCC 4.7.1 on ARCH Linux
Fix clang compiler warnings on FreeBSD in erts
Diffstat (limited to 'erts/emulator/drivers')
| -rw-r--r-- | erts/emulator/drivers/common/gzio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/drivers/common/gzio.c b/erts/emulator/drivers/common/gzio.c index ca6d25adb4..e085c262b0 100644 --- a/erts/emulator/drivers/common/gzio.c +++ b/erts/emulator/drivers/common/gzio.c @@ -13,6 +13,7 @@ # include "config.h" #endif #include <stdio.h> +#include <string.h> /* ssize_t on Mac OS X */ #include <errno.h> #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -314,7 +315,7 @@ local int get_byte(s) if (s->z_eof) return EOF; if (s->stream.avail_in == 0) { #ifdef UNIX - size_t res; + ssize_t res; errno = 0; res = ERTS_GZREAD(s->file, s->inbuf, Z_BUFSIZE); if (res == 0) { @@ -487,7 +488,7 @@ erts_gzread(gzFile file, voidp buf, unsigned len) } if (s->stream.avail_in == 0 && !s->z_eof) { #ifdef UNIX - size_t res; + ssize_t res; errno = 0; res = ERTS_GZREAD(s->file, s->inbuf, Z_BUFSIZE); if (res == 0) { |