From 5e4c9b37312e7d9dcb88e1e0a1fc279c780dd89e Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Tue, 15 Jul 2014 18:04:43 +0200 Subject: Detect presence of SSL_get_current_compression Apparently we still build against OpenSSL so old that it doesn't have this function, so add an autoconf check for it to make the buildfarm happy. If the function doesn't exist, always return that compression is disabled, since presumably the actual compression functionality is always missing. For now, hardcode the function as present on MSVC, since we should hopefully be well beyond those old versions on that platform. --- src/include/pg_config.h.in | 3 +++ src/include/pg_config.h.win32 | 3 +++ src/include/port.h | 4 ++++ 3 files changed, 10 insertions(+) (limited to 'src') diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 4fb7288710d..d30a2a701b0 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -433,6 +433,9 @@ /* Define to 1 if you have the `srandom' function. */ #undef HAVE_SRANDOM +/* Define to 1 if you have the `SSL_get_current_compression' function. */ +#undef HAVE_SSL_GET_CURRENT_COMPRESSION + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 58777caa5f2..e9fa43e49b4 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -340,6 +340,9 @@ /* Define to 1 if you have the `srandom' function. */ /* #undef HAVE_SRANDOM */ +/* Define to 1 if you have the `SSL_get_current_compression' function. */ +#define HAVE_SSL_GET_CURRENT_COMPRESSION 1 + /* Define to 1 if you have the header file. */ /* #undef HAVE_STDINT_H */ diff --git a/src/include/port.h b/src/include/port.h index 3d974818344..9f8465e78ad 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -420,6 +420,10 @@ extern void unsetenv(const char *name); extern void srandom(unsigned int seed); #endif +#ifndef HAVE_SSL_GET_CURRENT_COMPRESSION +#define SSL_get_current_compression(x) 0 +#endif + /* thread.h */ extern char *pqStrerror(int errnum, char *strerrbuf, size_t buflen); -- cgit v1.2.3