[ctypes-commit] ctypes/source _ctypes.c,1.321,1.322

[Thomas H. <th...@us...>]

Update of /cvsroot/ctypes/ctypes/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29512

Modified Files:
	_ctypes.c 
Log Message:
Merge in changes made in Python SVN:

Remove unused local variable.
Define RTLD_LOCAL as 0 if not #defined in header file (for Windows).
Define RTLD_GLOBAL as RTLD_LOCAL if not #defined in header file (for cygwin).


Index: _ctypes.c
===================================================================
RCS file: /cvsroot/ctypes/ctypes/source/_ctypes.c,v
retrieving revision 1.321
retrieving revision 1.322
diff -C2 -d -r1.321 -r1.322
*** _ctypes.c	11 Apr 2006 19:16:27 -0000	1.321
--- _ctypes.c	13 Apr 2006 18:03:41 -0000	1.322
***************
*** 905,909 ****
  	int length;
  
! 	int itemsize, itemalign, itemlen;
  
  	typedict = PyTuple_GetItem(args, 2);
--- 905,909 ----
  	int length;
  
! 	int itemsize, itemalign;
  
  	typedict = PyTuple_GetItem(args, 2);
***************
*** 942,946 ****
  	itemsize = itemdict->size;
  	itemalign = itemdict->align;
- 	itemlen = itemdict->length;
  
  	stgdict->size = itemsize * length;
--- 942,945 ----
***************
*** 4591,4598 ****
  #endif
  
! #ifdef RTLD_LOCAL
  	PyModule_AddObject(m, "RTLD_LOCAL", PyInt_FromLong(RTLD_LOCAL));
  	PyModule_AddObject(m, "RTLD_GLOBAL", PyInt_FromLong(RTLD_GLOBAL));
- #endif
  	
  	PyExc_ArgError = PyErr_NewException("ctypes.ArgumentError", NULL, NULL);
--- 4590,4607 ----
  #endif
  
! /* If RTLD_LOCAL is not defined (Windows!), set it to zero. */
! #ifndef RTLD_LOCAL
! #define RTLD_LOCAL 0
! #endif
! 
! /* If RTLD_GLOBAL is not defined (cygwin), set it to the same value as
!    RTLD_LOCAL.
! */
! #ifndef RTLD_GLOBAL
! #define RTLD_GLOBAL RTLD_LOCAL
! #endif
! 
  	PyModule_AddObject(m, "RTLD_LOCAL", PyInt_FromLong(RTLD_LOCAL));
  	PyModule_AddObject(m, "RTLD_GLOBAL", PyInt_FromLong(RTLD_GLOBAL));
  	
  	PyExc_ArgError = PyErr_NewException("ctypes.ArgumentError", NULL, NULL);