*** /home/trentm/main/contrib/python/dist/src/Modules/cPickle.c	Thu Jun  1 00:13:39 2000
--- /home/trentm/main/Apps/Perlium/Python/dist/src/Modules/cPickle.c	Fri Jun  2 15:53:42 2000
***************
*** 656,662 ****
      PyObject *value, *mv;
      long c_value;
      char s[30];
!     int len;
  
      UNLESS (mv = PyDict_GetItem(self->memo, id)) {
          PyErr_SetObject(PyExc_KeyError, id);
--- 656,662 ----
      PyObject *value, *mv;
      long c_value;
      char s[30];
!     size_t len;
  
      UNLESS (mv = PyDict_GetItem(self->memo, id)) {
          PyErr_SetObject(PyExc_KeyError, id);
***************
*** 717,723 ****
  static int
  put2(Picklerobject *self, PyObject *ob) {
      char c_str[30];
!     int p, len, res = -1;
      PyObject *py_ob_id = 0, *memo_len = 0, *t = 0;
  
      if (self->fast) return 0;
--- 717,725 ----
  static int
  put2(Picklerobject *self, PyObject *ob) {
      char c_str[30];
!     int p;
!     size_t len;
!     int res = -1;
      PyObject *py_ob_id = 0, *memo_len = 0, *t = 0;
  
      if (self->fast) return 0;
***************
*** 727,733 ****
  
      p++;  /* Make sure memo keys are positive! */
  
!     UNLESS (py_ob_id = PyInt_FromLong((long)ob))
          goto finally;
  
      UNLESS (memo_len = PyInt_FromLong(p))
--- 729,735 ----
  
      p++;  /* Make sure memo keys are positive! */
  
!     UNLESS (py_ob_id = PyLong_FromVoidPtr(ob))
          goto finally;
  
      UNLESS (memo_len = PyInt_FromLong(p))
***************
*** 1255,1261 ****
              goto finally;
      }
  
!     UNLESS (py_tuple_id = PyInt_FromLong((long)args))
          goto finally;
  
      if (len) {
--- 1257,1263 ----
              goto finally;
      }
  
!     UNLESS (py_tuple_id = PyLong_FromVoidPtr(args))
          goto finally;
  
      if (len) {
***************
*** 1775,1786 ****
      }
  
      if (args->ob_refcnt > 1) {
-         long ob_id;
          int  has_key;
  
!         ob_id = (long)args;
! 
!         UNLESS (py_ob_id = PyInt_FromLong(ob_id))
              goto finally;
  
          if ((has_key = cPickle_PyMapping_HasKey(self->memo, py_ob_id)) < 0)
--- 1777,1785 ----
      }
  
      if (args->ob_refcnt > 1) {
          int  has_key;
  
!         UNLESS (py_ob_id = PyLong_FromVoidPtr(args))
              goto finally;
  
          if ((has_key = cPickle_PyMapping_HasKey(self->memo, py_ob_id)) < 0)