Changeset 3059 for pjproject/trunk

Timestamp:

Jan 13, 2010 9:28:06 PM (15 years ago)

Author:

bennylp

Message:

Initial fixes for #993 (OpenSolaris? issues)

• configure script patch for FIONBIO and SIOCGIFFLAGS errors

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)
• pjlib/include/pj/compat/os_auto.h.in (modified) (1 diff)
• pjlib/include/pj/compat/socket.h (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -4718 +4718 @@
 
 
+ac_fn_c_check_header_mongrel "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_filio_h" = x""yes; then :
+  $as_echo "#define PJ_HAS_SYS_FILIO_H 1" >>confdefs.h
+
+fi
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sockio_h" = x""yes; then :
+  $as_echo "#define PJ_HAS_SYS_SOCKIO_H 1" >>confdefs.h
+
+fi
+
+
 ac_fn_c_check_header_mongrel "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default"
 if test "x$ac_cv_header_time_h" = x""yes; then :

pjproject/trunk/aconfigure.ac

@@ -173 +173 @@
 AC_CHECK_HEADER(sys/timeb.h,[AC_DEFINE(PJ_HAS_SYS_TIMEB_H,1)])
 AC_CHECK_HEADER(sys/types.h,[AC_DEFINE(PJ_HAS_SYS_TYPES_H,1)])
+AC_CHECK_HEADER(sys/filio.h,[AC_DEFINE(PJ_HAS_SYS_FILIO_H,1)])
+AC_CHECK_HEADER(sys/sockio.h,[AC_DEFINE(PJ_HAS_SYS_SOCKIO_H,1)])
 AC_CHECK_HEADER(time.h,[AC_DEFINE(PJ_HAS_TIME_H,1)])
 AC_CHECK_HEADER(unistd.h,[AC_DEFINE(PJ_HAS_UNISTD_H,1)])

pjproject/trunk/pjlib/include/pj/compat/os_auto.h.in

@@ -72 +72 @@
 #undef PJ_HAS_SYS_TIMEB_H
 #undef PJ_HAS_SYS_TYPES_H
+#undef PJ_HAS_SYS_FILIO_H
+#undef PJ_HAS_SYS_SOCKIO_H
 #undef PJ_HAS_TIME_H
 #undef PJ_HAS_UNISTD_H

pjproject/trunk/pjlib/include/pj/compat/socket.h

@@ -138 +138 @@
 #if defined(PJ_HAS_UNISTD_H) && PJ_HAS_UNISTD_H != 0
 #  include <unistd.h>
+#endif
+
+#if defined(PJ_HAS_SYS_FILIO_H) && PJ_HAS_SYS_FILIO_H != 0
+#   include <sys/filio.h>
+#endif
+
+#if defined(PJ_HAS_SYS_SOCKIO_H) && PJ_HAS_SYS_SOCKIO_H != 0
+#   include <sys/sockio.h>
 #endif