From a3bae55d41f5159df3a0125f02a8fa322e81bbe3 Mon Sep 17 00:00:00 2001 From: Michał Cichoń Date: Tue, 25 Aug 2015 06:45:41 +0200 Subject: libpiano: Abstract out blowfish cipher to PianoCipher_t so different implementations than gcrypt can be used. --- src/config.h | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'src/config.h') diff --git a/src/config.h b/src/config.h index 788455c..2d335a9 100644 --- a/src/config.h +++ b/src/config.h @@ -6,32 +6,21 @@ #define VERSION "2014.09.28-dev" -/* glibc feature test macros, define _before_ including other files */ -#define _POSIX_C_SOURCE 200809L - -/* ffmpeg/libav quirks detection - * ffmpeg’s micro versions always start at 100, that’s how we can distinguish - * ffmpeg and libav */ -#include - -/* is "timeout" option present (all versions of ffmpeg, not libav) */ -#if LIBAVFILTER_VERSION_MICRO >= 100 -#define HAVE_AV_TIMEOUT +/* Visual C++ name restrict differently */ +#ifdef _WIN32 +#define restrict __restrict #endif -/* does graph_send_command exist (ffmpeg >=2.2) */ -#if LIBAVFILTER_VERSION_MAJOR >= 4 && \ - LIBAVFILTER_VERSION_MICRO >= 100 -#define HAVE_AVFILTER_GRAPH_SEND_COMMAND +/* Visual C++ does not have inline keyword in C */ +#ifdef _WIN32 +#define inline __inline #endif -/* need avcodec.h (ffmpeg 1.2) */ -#if LIBAVFILTER_VERSION_MAJOR == 3 && \ - LIBAVFILTER_VERSION_MINOR <= 42 && \ - LIBAVFILTER_VERSION_MINOR > 32 && \ - LIBAVFILTER_VERSION_MICRO >= 100 -#define HAVE_AV_BUFFERSINK_GET_BUFFER_REF -#define HAVE_LIBAVFILTER_AVCODEC_H +/* Visual C++ does not have strcasecmp */ +#ifdef _WIN32 +#define strcasecmp _stricmp #endif +#define CURL_STATICLIB + #endif /* SRC_CONFIG_H_S6A1C09K */ -- cgit v1.2.3