[Python-checkins] python/dist/src/Python dynload_aix.c,2.11,2.11.6.1

nnorwitz@users.sourceforge.net nnorwitz@users.sourceforge.net
Fri, 10 Jan 2003 15:32:04 -0800


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

Modified Files:
      Tag: release22-maint
	dynload_aix.c 
Log Message:
Backport 2.12:  Fix for SF #639945, 64-bit bug on AIX when loading
dynamic modules


Index: dynload_aix.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/dynload_aix.c,v
retrieving revision 2.11
retrieving revision 2.11.6.1
diff -C2 -d -r2.11 -r2.11.6.1
*** dynload_aix.c	28 Nov 2001 21:35:49 -0000	2.11
--- dynload_aix.c	10 Jan 2003 23:32:02 -0000	2.11.6.1
***************
*** 78,83 ****
  			*/
  			offset = (unsigned int)ldiptr->ldinfo_next;
! 			ldiptr = (struct ld_info *)((unsigned int)
! 						    ldiptr + offset);
  			continue;
  		}
--- 78,82 ----
  			*/
  			offset = (unsigned int)ldiptr->ldinfo_next;
! 			ldiptr = (struct ld_info *)((char*)ldiptr + offset);
  			continue;
  		}
***************
*** 99,103 ****
  		prevmodptr = modptr;
  		offset = (unsigned int)ldiptr->ldinfo_next;
! 		ldiptr = (struct ld_info *)((unsigned int)ldiptr + offset);
  	} while (offset);
  	free(ldibuf);
--- 98,102 ----
  		prevmodptr = modptr;
  		offset = (unsigned int)ldiptr->ldinfo_next;
! 		ldiptr = (struct ld_info *)((char*)ldiptr + offset);
  	} while (offset);
  	free(ldibuf);