[Python-checkins] python/dist/src/Modules resource.c,2.29,2.30

[loewis@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv15696/Modules

Modified Files:
	resource.c 
Log Message:
Patch #650412: Check whether the address of flock and getpagesize
can be taken, and use _SC_PAGE_SIZE if getpagesize is not available.


Index: resource.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/resource.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -d -r2.29 -r2.30
*** resource.c	29 Mar 2003 10:04:54 -0000	2.29
--- resource.c	30 Mar 2003 17:23:49 -0000	2.30
***************
*** 6,9 ****
--- 6,13 ----
  #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.
***************
*** 194,198 ****
  	if (!PyArg_ParseTuple(args, ":getpagesize"))
  		return NULL;
! 	return Py_BuildValue("i", getpagesize());
  }
  
--- 198,210 ----
  	if (!PyArg_ParseTuple(args, ":getpagesize"))
  		return NULL;
! 
! 	long pagesize = 0;
! #if defined(HAVE_GETPAGESIZE)
! 	pagesize = getpagesize();
! #elif defined(HAVE_SYSCONF)
! 	pagesize = sysconf(_SC_PAGE_SIZE);
! #endif
! 	return Py_BuildValue("i", pagesize);
! 
  }