[patch] on AMD64 sizeof(int)!=sizeof(long)

sim-0.9.3-amd64.diff (text/plain), 1.76 KB, created by Valery Kartel on 2005-03-23 09:54:04 UTC

diff -ur sim-0.9.3.orig/plugins/_core/cfgdlg.cpp sim-0.9.3/plugins/_core/cfgdlg.cpp
--- sim-0.9.3.orig/plugins/_core/cfgdlg.cpp	2004-03-07 14:39:54.000000000 +0200
+++ sim-0.9.3/plugins/_core/cfgdlg.cpp	2005-03-23 18:55:23.000000000 +0200
@@ -465,7 +465,7 @@
             continue;
         size_t size = 0;
         for (const DataDef *d = def; d->name; ++d)
-            size += sizeof(unsigned) * d->n_values;
+            size += sizeof(Data) * d->n_values;
         void *data = malloc(size);
         string cfg = client->getConfig();
         load_data(def, data, cfg.c_str());
diff -ur sim-0.9.3.orig/sim/api/contacts.cpp sim-0.9.3/sim/api/contacts.cpp
--- sim-0.9.3.orig/sim/api/contacts.cpp	2004-03-19 10:13:29.000000000 +0200
+++ sim-0.9.3/sim/api/contacts.cpp	2005-03-23 18:56:22.000000000 +0200
@@ -1331,7 +1331,7 @@
     const DataDef *def = client->protocol()->userDataDef();
     size_t size = 0;
     for (const DataDef *d = def; d->name; ++d)
-        size += sizeof(unsigned) * d->n_values;
+        size += sizeof(Data) * d->n_values;
     data.data = malloc(size);
     load_data(def, data.data, cfg);
     p->push_back(data);
@@ -1344,7 +1344,7 @@
     const DataDef *def = client->protocol()->userDataDef();
     size_t size = 0;
     for (const DataDef *d = def; d->name; ++d)
-        size += sizeof(unsigned) * d->n_values;
+        size += sizeof(Data) * d->n_values;
     data.data = malloc(size);
     load_data(def, data.data, NULL);
     p->push_back(data);
@@ -1560,7 +1560,7 @@
     }
     size_t size = 0;
     for (const DataDef *def = (*it).def; def->name; ++def)
-        size += sizeof(unsigned) * def->n_values;
+        size += sizeof(Data) * def->n_values;
     userData[id] = malloc(size);
     load_data((*it).def, userData[id], NULL);
     return userData[id];