diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-11-10 13:22:24 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-11-10 13:24:58 +0100 |
| commit | a774d7b533e0bbc50fdedeac7121a5a6c043a323 (patch) | |
| tree | f9df714374d3c806c5fbb2bc26c1d02552b8fbca /main/freeswitch/fix-build-for-postgresql10.patch | |
| parent | 76c8b58ff71561ae88f1efdfd502c1471763784d (diff) | |
| download | aports-a774d7b533e0bbc50fdedeac7121a5a6c043a323.tar.bz2 aports-a774d7b533e0bbc50fdedeac7121a5a6c043a323.tar.xz | |
main/freeswitch: partial fix for PostgreSQL 10
This is incomplete, autohells detection still fails.
Diffstat (limited to 'main/freeswitch/fix-build-for-postgresql10.patch')
| -rw-r--r-- | main/freeswitch/fix-build-for-postgresql10.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/main/freeswitch/fix-build-for-postgresql10.patch b/main/freeswitch/fix-build-for-postgresql10.patch new file mode 100644 index 0000000000..6d23110491 --- /dev/null +++ b/main/freeswitch/fix-build-for-postgresql10.patch @@ -0,0 +1,36 @@ +From 9d96741f56b7f663fd1b0ad625b4b7042832ebca Mon Sep 17 00:00:00 2001 +From: Italo Rossi <italorossib@gmail.com> +Date: Mon, 6 Nov 2017 10:35:36 -0300 +Subject: [PATCH] FS-10774 - [switch_pgsql] Fix build for PostgreSQL/libpq 10 + +Upstream-Issue: https://freeswitch.org/jira/browse/FS-10774 +Patch-Source: https://freeswitch.org/stash/projects/FS/repos/freeswitch/commits/9d96741f56b7f663fd1b0ad625b4b7042832ebca +--- + src/switch_pgsql.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/switch_pgsql.c b/src/switch_pgsql.c +index 7928624270..f3411361fd 100644 +--- a/src/switch_pgsql.c ++++ b/src/switch_pgsql.c +@@ -386,7 +386,7 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_next_result_timed(switch_pgsq + *result_out = res; + res->status = PQresultStatus(res->result); + switch(res->status) { +-#if POSTGRESQL_MAJOR_VERSION >= 9 && POSTGRESQL_MINOR_VERSION >= 2 ++#if (POSTGRESQL_MAJOR_VERSION == 9 && POSTGRESQL_MINOR_VERSION >= 2) || POSTGRESQL_MAJOR_VERSION > 9 + case PGRES_SINGLE_TUPLE: + /* Added in PostgreSQL 9.2 */ + #endif +@@ -397,7 +397,7 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_next_result_timed(switch_pgsq + res->cols = PQnfields(res->result); + } + break; +-#if POSTGRESQL_MAJOR_VERSION >= 9 && POSTGRESQL_MINOR_VERSION >= 1 ++#if (POSTGRESQL_MAJOR_VERSION == 9 && POSTGRESQL_MINOR_VERSION >= 1) || POSTGRESQL_MAJOR_VERSION > 9 + case PGRES_COPY_BOTH: + /* Added in PostgreSQL 9.1 */ + #endif +-- +2.15.0 + |