From da98aa3dbc0c81cfa8f094d9554ea8ad62583326 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 5 Jan 2015 18:57:40 +0100 Subject: [PATCH] misc: various compilation warning fixes and copyright updates. --- bootstrap | 4 ++-- configure.ac | 12 ++++++++++-- msvc/config.h | 2 +- src/common/fd.c | 2 +- src/common/fuzz.c | 2 +- src/libzzuf/lib-load.h | 2 +- src/libzzuf/sys.c | 2 +- src/zzuf.c | 2 ++ 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/bootstrap b/bootstrap index 2c1dc35..93b37e6 100755 --- a/bootstrap +++ b/bootstrap @@ -1,8 +1,8 @@ #! /bin/sh -# bootstrap: generic bootstrap/autogen.sh script for autotools projects +# bootstrap - generic bootstrap/autogen.sh script for autotools projects # -# Copyright (c) 2002-2014 Sam Hocevar +# Copyright © 2002—2015 Sam Hocevar # # This program is free software. It comes without any warranty, to # the extent permitted by applicable law. You can redistribute it diff --git a/configure.ac b/configure.ac index dfd46bf..bd324f7 100644 --- a/configure.ac +++ b/configure.ac @@ -61,11 +61,19 @@ esac AC_SUBST(WINSOCK2_LIBS) AC_SUBST(DLL_LDFLAGS) -AC_CHECK_HEADERS(windows.h winsock2.h io.h process.h unistd.h inttypes.h stdint.h libc.h malloc.h dlfcn.h regex.h sys/cdefs.h sys/socket.h netinet/in.h arpa/inet.h sys/uio.h aio.h sys/mman.h sys/wait.h sys/resource.h sys/time.h endian.h mach/task.h) +AC_CHECK_HEADERS(unistd.h inttypes.h stdint.h endian.h libc.h) +AC_CHECK_HEADERS(windows.h winsock2.h process.h) +AC_CHECK_HEADERS(malloc.h dlfcn.h regex.h sys/cdefs.h sys/socket.h) +AC_CHECK_HEADERS(netinet/in.h arpa/inet.h sys/uio.h aio.h) +AC_CHECK_HEADERS(sys/mman.h sys/wait.h sys/resource.h sys/time.h) +AC_CHECK_HEADERS(io.h mach/task.h) AC_CHECK_FUNCS(setenv waitpid setrlimit gettimeofday fork kill pipe _pipe) AC_CHECK_FUNCS(regexec regwexec) -AC_CHECK_FUNCS(dup dup2 ftello fseeko _IO_getc getline getdelim fgetln map_fd memalign posix_memalign aio_read accept bind connect socket readv pread recv recvfrom recvmsg mmap valloc sigaction getpagesize) +AC_CHECK_FUNCS(dup dup2 ftello fseeko _IO_getc getline getdelim fgetln map_fd) +AC_CHECK_FUNCS(memalign posix_memalign aio_read accept bind connect socket) +AC_CHECK_FUNCS(readv pread recv recvfrom recvmsg valloc sigaction) +AC_CHECK_FUNCS(mmap getpagesize) AC_CHECK_FUNCS(getc_unlocked getchar_unlocked fgetc_unlocked fread_unlocked fgets_unlocked) AC_CHECK_FUNCS(__getdelim __srefill __filbuf __srget __uflow) AC_CHECK_FUNCS(open64 lseek64 mmap64 fopen64 freopen64 ftello64 fseeko64 fsetpos64) diff --git a/msvc/config.h b/msvc/config.h index 5f92a01..8a551bf 100644 --- a/msvc/config.h +++ b/msvc/config.h @@ -16,7 +16,7 @@ #define ATTRIBUTE_PRINTF(x,y) /* */ #define CONNECT_USES_STRUCT_SOCKADDR 1 -#define FPOS_CAST(x) (x) +#define FPOS64_CAST(x) (x) #define HAVE_ACCEPT 1 /* #undef HAVE_AIO_H */ /* #undef HAVE_AIO_READ */ diff --git a/src/common/fd.c b/src/common/fd.c index 71699ac..c67347c 100644 --- a/src/common/fd.c +++ b/src/common/fd.c @@ -1,7 +1,7 @@ /* * zzuf - general purpose fuzzer * - * Copyright © 2006—2015 Sam Hocevar + * Copyright © 2002—2015 Sam Hocevar * 2012 Kévin Szkudłapski * * This program is free software. It comes without any warranty, to diff --git a/src/common/fuzz.c b/src/common/fuzz.c index c647325..113a07a 100644 --- a/src/common/fuzz.c +++ b/src/common/fuzz.c @@ -1,7 +1,7 @@ /* * zzuf - general purpose fuzzer * - * Copyright © 2006—2015 Sam Hocevar + * Copyright © 2002—2015 Sam Hocevar * * This program is free software. It comes without any warranty, to * the extent permitted by applicable law. You can redistribute it diff --git a/src/libzzuf/lib-load.h b/src/libzzuf/lib-load.h index 0914d3b..6712060 100644 --- a/src/libzzuf/lib-load.h +++ b/src/libzzuf/lib-load.h @@ -1,7 +1,7 @@ /* * zzuf - general purpose fuzzer * - * Copyright © 2006—2015 Sam Hocevar + * Copyright © 2002—2015 Sam Hocevar * * This program is free software. It comes without any warranty, to * the extent permitted by applicable law. You can redistribute it diff --git a/src/libzzuf/sys.c b/src/libzzuf/sys.c index 1f216ae..ae27294 100644 --- a/src/libzzuf/sys.c +++ b/src/libzzuf/sys.c @@ -1,7 +1,7 @@ /* * zzuf - general purpose fuzzer * - * Copyright © 2006—2015 Sam Hocevar + * Copyright © 2002—2015 Sam Hocevar * 2012 Kévin Szkudłapski * * This program is free software. It comes without any warranty, to diff --git a/src/zzuf.c b/src/zzuf.c index 6116e2f..15ffa7d 100644 --- a/src/zzuf.c +++ b/src/zzuf.c @@ -18,6 +18,8 @@ #include "config.h" #define _INCLUDE_POSIX_SOURCE /* for STDERR_FILENO on HP-UX */ +#define _POSIX_SOURCE /* for kill() on glibc systems */ +#define _BSD_SOURCE /* for setenv() on glibc systems */ #if defined HAVE_STDINT_H # include