summaryrefslogtreecommitdiff
path: root/psycopg/psycopg.h
diff options
context:
space:
mode:
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>2016-08-07 01:53:21 +0100
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>2016-08-07 01:53:21 +0100
commit2a4d6027a4e5732af1cdc41969c5cab3bb30430b (patch)
tree4f0ae8858ddaed8e23b3a803e4033fa77b7524f0 /psycopg/psycopg.h
parentd5443c65fde6cae87a1dcd901f31b6cdca7a1811 (diff)
parent90ee1ebba5d1da4bd9d8c6e12944308074732f08 (diff)
downloadpsycopg2-2a4d6027a4e5732af1cdc41969c5cab3bb30430b.tar.gz
Merge branch 'master' into replication-protocol
Conflicts: tests/testconfig.py
Diffstat (limited to 'psycopg/psycopg.h')
-rw-r--r--psycopg/psycopg.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/psycopg/psycopg.h b/psycopg/psycopg.h
index adda12d..3174f30 100644
--- a/psycopg/psycopg.h
+++ b/psycopg/psycopg.h
@@ -132,6 +132,9 @@ STEALS(1) HIDDEN PyObject * psycopg_ensure_bytes(PyObject *obj);
STEALS(1) HIDDEN PyObject * psycopg_ensure_text(PyObject *obj);
+HIDDEN PyObject *psycopg_dict_from_conninfo_options(PQconninfoOption *options,
+ int include_password);
+
/* Exceptions docstrings */
#define Error_doc \
"Base class for error exceptions."