From 740f53a6006cc8d8897a843394700cd8ec0dc0d6 Mon Sep 17 00:00:00 2001
From: Jesus Cea <jcea@jcea.es>
Date: Wed, 28 Apr 2010 11:35:30 +0000
Subject: Merged revisions 80574 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80574 | jesus.cea | 2010-04-28 12:32:30 +0200 (Wed, 28 Apr 2010) | 1 line

  Issue #3928: Support 'os.mknod()' in Solaris
........
---
 Misc/NEWS    |  2 ++
 configure    | 22 +++++++++++++++-------
 configure.in | 12 ++++++++++--
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index ff469e7..2aedcdb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1098,6 +1098,8 @@ Extension Modules
 Build
 -----
 
+- Issue #3928: os.mknod() now available in Solaris, also.
+
 - Issue #3326: Build Python without -fno-strict-aliasing when the gcc does not
   give false warnings.
 
diff --git a/configure b/configure
index a29a021..1b084e9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 80478 .
+# From configure.in Revision: 80481 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 3.2.
 #
@@ -1928,11 +1928,11 @@ else
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
-	     enum { N = $2 / 2 - 1 };
 int
 main ()
 {
-static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
+	     0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
 test_array [0] = 0
 
   ;
@@ -1943,11 +1943,11 @@ if ac_fn_c_try_compile "$LINENO"; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
-	        enum { N = $2 / 2 - 1 };
 int
 main ()
 {
-static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
+		($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
 		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
 test_array [0] = 0
 
@@ -6274,11 +6274,19 @@ $as_echo_n "checking for makedev... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-  #include <sys/types.h>
+#if defined(MAJOR_IN_MKDEV)
+#include <sys/mkdev.h>
+#elif defined(MAJOR_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#else
+#include <sys/types.h>
+#endif
+
 int
 main ()
 {
- makedev(0, 0)
+
+  makedev(0, 0)
   ;
   return 0;
 }
diff --git a/configure.in b/configure.in
index 7d3c573..d4f74bc 100644
--- a/configure.in
+++ b/configure.in
@@ -1314,8 +1314,16 @@ AC_MSG_RESULT($was_it_defined)
 
 # Check whether using makedev requires defining _OSF_SOURCE
 AC_MSG_CHECKING(for makedev)
-AC_LINK_IFELSE([
-  AC_LANG_PROGRAM([[#include <sys/types.h> ]], [[ makedev(0, 0) ]])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#if defined(MAJOR_IN_MKDEV)
+#include <sys/mkdev.h>
+#elif defined(MAJOR_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#else
+#include <sys/types.h>
+#endif
+]], [[
+  makedev(0, 0) ]])
 ],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no])
 if test "$ac_cv_has_makedev" = "no"; then
     # we didn't link, try if _OSF_SOURCE will allow us to link
-- 
cgit v0.12