summaryrefslogtreecommitdiff
path: root/sanei/sanei_init_debug.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-09-10 19:11:27 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-09-10 19:11:27 +0200
commit7e9455b3b15671ff99ed168638c405e2acedb6df (patch)
tree444e59ece236e09dc153f665e42160aeb0208c24 /sanei/sanei_init_debug.c
parentbc8a517abd2e11e1435f4ef042cfcc8648b62ef7 (diff)
parentbce41b3c37c2a68e7dab234ce0247755a61ceb40 (diff)
Merge branch 'release/debian/1.0.31-1_experimental1' into masterdebian/1.0.31-1_experimental1
Diffstat (limited to 'sanei/sanei_init_debug.c')
-rw-r--r--sanei/sanei_init_debug.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sanei/sanei_init_debug.c b/sanei/sanei_init_debug.c
index 3cde74e..d5d64f2 100644
--- a/sanei/sanei_init_debug.c
+++ b/sanei/sanei_init_debug.c
@@ -118,7 +118,7 @@ is_socket (int fd)
#if defined(S_ISSOCK)
return S_ISSOCK(sbuf.st_mode);
-#elif defined (S_IFMT) && defined(S_IFMT)
+#elif defined (S_IFMT) && defined(S_IFSOCK)
return (sbuf.st_mode & S_IFMT) == S_IFSOCK;
#else
return 0;
@@ -133,6 +133,7 @@ sanei_debug_msg
if (max_level >= level)
{
+#if defined(LOG_DEBUG)
if (is_socket(fileno(stderr)))
{
msg = (char *)malloc (sizeof(char) * (strlen(be) + strlen(fmt) + 4));
@@ -149,6 +150,7 @@ sanei_debug_msg
}
}
else
+#endif
{
struct timeval tv;
struct tm *t;