Bug#469008: viewmol: may use different memory API for a given memory block

[Barry deFreese]

tags 469008 + patch

thank you

Hi,

Here is a patch to resolve this issue.

Thank you,

Barry deFreese



only in patch2:
unchanged:
--- viewmol-2.4.1.orig/source/labelmodule.c
+++ viewmol-2.4.1/source/labelmodule.c
@@ -217,7 +217,7 @@
 static void label_dealloc(PyLabelSpecObject *self)
 {
   /* This has to be a dummy function, since labels are handled in Viewmol
-  PyMem_DEL(self); */
+  PyObject_Del(self); */
 }
 
 static PyObject *label_getattr(PyLabelSpecObject *self, char *name)
only in patch2:
unchanged:
--- viewmol-2.4.1.orig/source/energylevelmodule.c
+++ viewmol-2.4.1/source/energylevelmodule.c
@@ -304,7 +304,7 @@
 static void energylevels_dealloc(PyEnergyLevelSpecObject *self)
 {
   if (!self) return;
-  PyMem_DEL(self);
+  PyObject_Del(self);
   quitMODiagram((Widget)0, (caddr_t)0, (XmAnyCallbackStruct *)0);
   (void)checkInterrupt();
 }
only in patch2:
unchanged:
--- viewmol-2.4.1.orig/source/moleculemodule.c
+++ viewmol-2.4.1/source/moleculemodule.c
@@ -1017,7 +1017,7 @@
 static void molecule_dealloc(PyMoleculeSpecObject *self)
 {
   /* A dummy function is required here to avoid crashing
-  PyMem_DEL(self); */
+  PyObject_Del(self); */
 }
 
 void initMoleculeModule(void)
only in patch2:
unchanged:
--- viewmol-2.4.1.orig/source/atommodule.c
+++ viewmol-2.4.1/source/atommodule.c
@@ -374,7 +374,7 @@
 static void atom_dealloc(PyAtomSpecObject *self)
 {
   if (!self) return;
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject *atom_getattr(PyAtomSpecObject *self, char *name)
only in patch2:
unchanged:
--- viewmol-2.4.1.orig/source/historymodule.c
+++ viewmol-2.4.1/source/historymodule.c
@@ -318,7 +318,7 @@
 static void history_dealloc(PyHistorySpecObject *self)
 {
   if (!self) return;
-  PyMem_DEL(self);
+  PyObject_Del(self);
   quitHistory((Widget)0, (caddr_t)0, (XmAnyCallbackStruct *)0);
   (void)checkInterrupt();
 }
only in patch2:
unchanged:
--- viewmol-2.4.1.orig/source/lightmodule.c
+++ viewmol-2.4.1/source/lightmodule.c
@@ -134,7 +134,7 @@
 static void light_dealloc(PyLightSpecObject *self)
 {
   if (!self) return;
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject *light_getattr(PyLightSpecObject *self, char *name)
only in patch2:
unchanged:
--- viewmol-2.4.1.orig/source/spectrummodule.c
+++ viewmol-2.4.1/source/spectrummodule.c
@@ -383,7 +383,7 @@
 static void spectrum_dealloc(PySpectrumSpecObject *self)
 {
   if (!self) return;
-  PyMem_DEL(self);
+  PyObject_Del(self);
   quitSpectrum((Widget)0, (caddr_t)0, (XmAnyCallbackStruct *)0);
   (void)checkInterrupt();
 }
only in patch2:
unchanged:
--- viewmol-2.4.1.orig/source/elementmodule.c
+++ viewmol-2.4.1/source/elementmodule.c
@@ -369,7 +369,7 @@
 static void element_dealloc(PyElementSpecObject *self)
 {
   if (!self) return;
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject *element_getattr(PyElementSpecObject *self, char *name)
only in patch2:
unchanged:
--- viewmol-2.4.1.orig/source/input.c
+++ viewmol-2.4.1/source/input.c
@@ -1603,7 +1603,7 @@
     if (mol->exponents != NULL)    fremem((void **)&(mol->exponents));
     if (mol->addedBonds != NULL)   fremem((void **)&(mol->addedBonds));
     if (mol->deletedBonds != NULL) fremem((void **)&(mol->deletedBonds));
-/*  PyMem_DEL(mol->pyObject);*/
+/*  PyObject_Del(mol->pyObject);*/
 
     if (first != nmolecule-1)
     {