Patch #1005568: Use _SC_PAGESIZE on Irix.

diff --git a/Misc/NEWS b/Misc/NEWS
index fcdb8b73942ecfe3a223b8a629ebc2c59f3eaec1..6ae47d2e9aec5bf743386b8a54a0f0fe92dc89e4 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,8 @@ Core and builtins
 Extension modules
 -----------------
 
+- Patch #1005568: Use _SC_PAGESIZE on Irix in resourcemoudle.
+
 - Patch #924294: Do no check for AF_INET6 if it is not defined.
 
 - Patch #954115: Properly handle UNC roots in nt.stat.

diff --git a/Modules/resource.c b/Modules/resource.c
index c1b637758dced4f0a63edb781d6d90a565bd033b..c5bec79043d25d3a7955e78a7e7f51cd8f1ed73f 100644 (file)
--- a/Modules/resource.c
+++ b/Modules/resource.c
@@ -202,7 +202,12 @@ resource_getpagesize(PyObject *self, PyObject *args)
 #if defined(HAVE_GETPAGESIZE)
        pagesize = getpagesize();
 #elif defined(HAVE_SYSCONF)
+#if defined(_SC_PAGE_SIZE)
        pagesize = sysconf(_SC_PAGE_SIZE);
+#else
+       /* Irix 5.3 has _SC_PAGESIZE, but not _SC_PAGE_SIZE */
+       pagesize = sysconf(_SC_PAGESIZE);
+#endif
 #endif
        return Py_BuildValue("i", pagesize);