Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 278 → Rev 279

/branches/7.8-stable/debian/changelog
1,3 → 1,11
pike7.8 (7.8.866-8) unstable; urgency=medium
 
* bad_postgres_mutex_init.patch: Remove incorrect initialization of
extern variable, which caused FTBFS with newer linkers (Closes:
#878566).
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 11 Nov 2017 23:55:00 +0100
 
pike7.8 (7.8.866-7) unstable; urgency=low
 
* Build-Depend on default-libmysqlclient-dev instead of
/branches/7.8-stable/debian/patches/bad_postgres_mutex_init.patch
0,0 → 1,18
Bug-Debian: https://bugs.debian.org/878566
Author: Henrik Grubbström (Grubba) <grubba@grubba.org>
Origin: upstream, http://pike-librarian.lysator.liu.se/piff.xml?module=pike.git&file=src/modules/Postgres/pgresult.c&from=bbd892a86e2f103ea5cf21199c7f2c19f6214ddd&to=7d05b499bb04616ae52ab094c274cc92156fbd7e
Description: Fixed compilation when STATIC_MUTEX_INIT exists and paranoid linker.
 
diff --git a/src/modules/Postgres/pgresult.c b/src/modules/Postgres/pgresult.c
index fb4b553859..03109ec96c 100644
--- a/src/modules/Postgres/pgresult.c
+++ b/src/modules/Postgres/pgresult.c
@@ -102,7 +102,7 @@
# define PQ_LOCK() mt_lock(pg_mutex)
# define PQ_UNLOCK() mt_unlock(pg_mutex)
# else
-extern PIKE_MUTEX_T pike_postgres_mutex STATIC_MUTEX_INIT;
+extern PIKE_MUTEX_T pike_postgres_mutex;
# define PQ_FETCH()
#define PQ_LOCK() mt_lock(&pike_postgres_mutex)
#define PQ_UNLOCK() mt_unlock(&pike_postgres_mutex)
/branches/7.8-stable/debian/patches/series
16,3 → 16,4
freetype_2.6_typeof.patch
clang_inline.patch
disable_peephole_opt_integer_overflow.patch
bad_postgres_mutex_init.patch