Changeset 334 for trunk/src

Timestamp:

Apr 21, 2011, 2:29:20 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #234: Spurious warnings about unsupported address family

File:

• trunk/src/sh_portcheck.c (modified) (2 diffs)

trunk/src/sh_portcheck.c

@@ -1273 +1273 @@
             perror(_("socket"));
 #else
-          SH_MUTEX_LOCK(mutex_thread_nolog);
-          sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN, 
-                          sh_error_message(errno, errbuf, sizeof(errbuf)), _("socket"));
-          SH_MUTEX_UNLOCK(mutex_thread_nolog);
+
+#ifndef EPROTONOSUPPORT
+#define EPROTONOSUPPORT 0
+#endif
+#ifndef EAFNOSUPPORT
+#define EAFNOSUPPORT    0
+#endif
+          if (errno != EPROTONOSUPPORT && errno != EAFNOSUPPORT)
+            {
+              SH_MUTEX_LOCK(mutex_thread_nolog);
+              sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN, 
+                              sh_error_message(errno, errbuf, sizeof(errbuf)), _("socket"));
+              SH_MUTEX_UNLOCK(mutex_thread_nolog);
+            }
 #endif
           continue;
@@ -1358 +1368 @@
             perror(_("socket"));
 #else
-          SH_MUTEX_LOCK(mutex_thread_nolog);
-          sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN, 
-                          sh_error_message(errno, errbuf, sizeof(errbuf)), _("socket"));
-          SH_MUTEX_UNLOCK(mutex_thread_nolog);
+#ifndef EPROTONOSUPPORT
+#define EPROTONOSUPPORT 0
+#endif
+#ifndef EAFNOSUPPORT
+#define EAFNOSUPPORT    0
+#endif
+          if (errno != EPROTONOSUPPORT && errno != EAFNOSUPPORT)
+            {
+              SH_MUTEX_LOCK(mutex_thread_nolog);
+              sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN, 
+                              sh_error_message(errno, errbuf, sizeof(errbuf)), _("socket"));
+              SH_MUTEX_UNLOCK(mutex_thread_nolog);
+            }
 #endif
           continue;