Patch #650412: Check whether the address of flock and getpagesize

can be taken, and use _SC_PAGE_SIZE if getpagesize is not available.

1 files changed, 13 insertions, 1 deletions

diff --git a/Modules/resource.c b/Modules/resource.c
index 003599d742..e82df6d976 100644
--- a/Modules/resource.c
+++ b/Modules/resource.c
@@ -5,6 +5,10 @@
 #include <sys/time.h>
 #include <string.h>
 #include <errno.h>
+/* for sysconf */
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
 
 /* On some systems, these aren't in any header file.
    On others they are, with inconsistent prototypes.
@@ -193,7 +197,15 @@ resource_getpagesize(PyObject *self, PyObject *args)
 {
 	if (!PyArg_ParseTuple(args, ":getpagesize"))
 		return NULL;
-	return Py_BuildValue("i", getpagesize());
+
+	long pagesize = 0;
+#if defined(HAVE_GETPAGESIZE)
+	pagesize = getpagesize();
+#elif defined(HAVE_SYSCONF)
+	pagesize = sysconf(_SC_PAGE_SIZE);
+#endif
+	return Py_BuildValue("i", pagesize);
+
 }
 
 /* List of functions */