X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=f08d43a8e96cbaa607518615acdb22703a1cf292;hp=6655d35672f410ebff1a5678841e9fee967c7996;hb=9d8fdf8898418711558f70a9630b2444036d8285;hpb=439d8d00c44b61ea1d1eee9caca91ad71aae389e diff --git a/para.h b/para.h index 6655d356..f08d43a8 100644 --- a/para.h +++ b/para.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2013 Andre Noll + * Copyright (C) 1997 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -19,13 +19,11 @@ #include #include #include -#include -#include -#include -#include /* needed by create_pf_socket */ #include #include #include +#include +#include #include "gcc-compat.h" /** used in various contexts */ @@ -62,7 +60,7 @@ extern __printf_2_3 void (*para_log)(int, const char*, ...); * */ #define DEFINE_STDERR_LOGGER(funcname, loglevel_barrier) \ - __printf_2_3 void funcname(int ll, const char* fmt,...) \ + static __printf_2_3 void funcname(int ll, const char* fmt,...) \ { \ va_list argp; \ if (ll < loglevel_barrier) \ @@ -90,7 +88,6 @@ int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds); int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *diff); long unsigned tv2ms(const struct timeval *tv); -void d2tv(double x, struct timeval *tv); void tv_add(const struct timeval *a, const struct timeval *b, struct timeval *sum); void tv_scale(const unsigned long mult, const struct timeval *tv, @@ -209,7 +206,7 @@ _static_inline_ bool iov_valid(const struct iovec *iov) * * 2. The wav header (para_write only). * - * 3. The --format option of para_write. + * 3. The --sample-format option of para_write. */ #define SAMPLE_FORMATS \ SAMPLE_FORMAT(SF_S8, "8 bit signed"), \