projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make ssl_check_error static and define ssl_type always.
[yaz-moved-to-github.git]
/
src
/
tcpip.c
diff --git
a/src/tcpip.c
b/src/tcpip.c
index
ae070d7
..
6cb4bbe
100644
(file)
--- a/
src/tcpip.c
+++ b/
src/tcpip.c
@@
-241,10
+241,11
@@
COMSTACK yaz_tcpip_create(int s, int flags, int protocol,
}
}
-#if ENABLE_SSL
-
COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
{
COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
{
+#if !ENABLE_SSL
+ return 0;
+#else
tcpip_state *sp;
COMSTACK p;
tcpip_state *sp;
COMSTACK p;
@@
-260,9
+261,11
@@
COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
/* note: we don't handle already opened socket in SSL mode - yet */
return p;
/* note: we don't handle already opened socket in SSL mode - yet */
return p;
+#endif
}
}
-int ssl_check_error(COMSTACK h, tcpip_state *sp, int res)
+#if !ENABLE_SSL
+static int ssl_check_error(COMSTACK h, tcpip_state *sp, int res)
{
#if HAVE_OPENSSL_SSL_H
int err = SSL_get_error(sp->ssl, res);
{
#if HAVE_OPENSSL_SSL_H
int err = SSL_get_error(sp->ssl, res);