summaryrefslogtreecommitdiffstats
path: root/crypto/bio
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-03-21 11:19:49 +0100
committerAndy Polyakov <appro@openssl.org>2018-03-22 11:49:17 +0100
commitd10ca7aed0028aeebbe8b91b3facd3dc2a5f42e7 (patch)
tree53e1aedb06f847e1beb7b575f32cf82654d33c58 /crypto/bio
parento_fopen.c: compensate for e_os.h omission. (diff)
downloadopenssl-d10ca7aed0028aeebbe8b91b3facd3dc2a5f42e7.tar.xz
openssl-d10ca7aed0028aeebbe8b91b3facd3dc2a5f42e7.zip
bio/bss_log.c: on DJGPP syslog facility is part of sockets library.
In other words no-sock DJGPP build should suppress syslogging. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5708)
Diffstat (limited to 'crypto/bio')
-rw-r--r--crypto/bio/bss_log.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index b04f7bbfd3..10acba1dee 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -39,6 +39,8 @@ void *_malloc32(__size_t);
# endif /* __INITIAL_POINTER_SIZE == 64 */
# endif /* __INITIAL_POINTER_SIZE && defined
* _ANSI_C_SOURCE */
+#elif defined(__DJGPP__) && defined(OPENSSL_NO_SOCK)
+# define NO_SYSLOG
#elif (!defined(MSDOS) || defined(WATT32)) && !defined(OPENSSL_SYS_VXWORKS) && !defined(NO_SYSLOG)
# include <syslog.h>
#endif