[VCDImager Bugs/Devel] vcd_debug.c has conflicting offset_t

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to [email protected] for more info.

---276672395-520477076-1032249550=:13062
Content-Type: TEXT/PLAIN; charset=US-ASCII


Hi!

When compiling vcdimager 0.7.12 on AIX 4.3 I noticed that you have
used offset_t as a type declaration in vcd_debug.c. This barfs on AIX
(and presumably other platforms) since offset_t is declared in the
system include files.

Attached is a patch that renames offset_t to vcd_offset_t in
vcd_debug.c. Have fun.


/Nikke
-- 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 Niklas Edmundsson, Admin @ {acc,hpc2n,ing}.umu.se    |   [email protected]
---------------------------------------------------------------------------
 FUNDAMENTALISM is never having to open your mind.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

---276672395-520477076-1032249550=:13062
Content-Type: TEXT/PLAIN; charset=US-ASCII; name=vcdimagerdiff
Content-Transfer-Encoding: BASE64
Content-ID: <[email protected]>
Content-Description: 
Content-Disposition: attachment; filename=vcdimagerdiff

LS0tIGRpc3QvZnJvbnRlbmRzL2NsaS92Y2RfZGVidWcuYwlGcmkgSmFuICA0
IDIxOjIwOjI5IDIwMDINCisrKyBhaXg0My9mcm9udGVuZHMvY2xpL3ZjZF9k
ZWJ1Zy5jCVR1ZSBTZXAgMTcgMDk6NTE6NDkgMjAwMg0KQEAgLTE5Niw3ICsx
OTYsNyBAQA0KICAgdWludDE2X3QgbGlkOw0KICAgdWludDE2X3Qgb2Zmc2V0
Ow0KICAgYm9vbCBpbl9sb3Q7DQotfSBvZmZzZXRfdDsNCit9IHZjZF9vZmZz
ZXRfdDsNCiANCiBzdGF0aWMgY29uc3QgY2hhciAqDQogX2FyZWFfc3RyIChj
b25zdCBzdHJ1Y3QgcHNkX2FyZWFfdCAqX2FyZWEpDQpAQCAtMjM4LDcgKzIz
OCw3IEBADQogDQogICBfVkNEX0xJU1RfRk9SRUFDSCAobm9kZSwgb2Zmc2V0
X2xpc3QpDQogICAgIHsNCi0gICAgICBvZmZzZXRfdCAqb2ZzID0gX3ZjZF9s
aXN0X25vZGVfZGF0YSAobm9kZSk7DQorICAgICAgdmNkX29mZnNldF90ICpv
ZnMgPSBfdmNkX2xpc3Rfbm9kZV9kYXRhIChub2RlKTsNCiANCiAgICAgICBp
ZiAob2Zmc2V0ID09IG9mcy0+b2Zmc2V0KQ0KICAgICAgICAgew0KQEAgLTI2
MCw3ICsyNjAsNyBAQA0KIF92aXNpdF9wYmMgKGRlYnVnX29ial90ICpvYmos
IHVuc2lnbmVkIGxpZCwgdW5zaWduZWQgb2Zmc2V0LCBib29sIGluX2xvdCwg
Ym9vbCBleHQpDQogew0KICAgVmNkTGlzdE5vZGUgKm5vZGU7DQotICBvZmZz
ZXRfdCAqb2ZzOw0KKyAgdmNkX29mZnNldF90ICpvZnM7DQogICB1bnNpZ25l
ZCBwc2Rfc2l6ZSA9IGV4dCA/IG9iai0+cHNkX3hfc2l6ZSA6IF9nZXRfcHNk
X3NpemUgKG9iaik7DQogICBjb25zdCB1aW50OF90ICpwc2QgPSBleHQgPyBv
YmotPnBzZF94IDogb2JqLT5wc2Q7DQogICB1bnNpZ25lZCBfcm9mcyA9IG9m
ZnNldCAqIG9iai0+aW5mby5vZmZzZXRfbXVsdDsNCkBAIC0zMDIsNyArMzAy
LDcgQEANCiAgICAgICAgIH0NCiAgICAgfQ0KIA0KLSAgb2ZzID0gX3ZjZF9t
YWxsb2MgKHNpemVvZiAob2Zmc2V0X3QpKTsNCisgIG9mcyA9IF92Y2RfbWFs
bG9jIChzaXplb2YgKHZjZF9vZmZzZXRfdCkpOw0KIA0KICAgb2ZzLT5vZmZz
ZXQgPSBvZmZzZXQ7DQogICBvZnMtPmxpZCA9IGxpZDsNCkBAIC0zNzAsNyAr
MzcwLDcgQEANCiB9DQogDQogc3RhdGljIGludA0KLV9vZmZzZXRfdF9jbXAg
KG9mZnNldF90ICphLCBvZmZzZXRfdCAqYikNCitfdmNkX29mZnNldF90X2Nt
cCAodmNkX29mZnNldF90ICphLCB2Y2Rfb2Zmc2V0X3QgKmIpDQogew0KICAg
aWYgKGEtPm9mZnNldCA+IGItPm9mZnNldCkNCiAgICAgcmV0dXJuIDE7DQpA
QCAtMzk3LDcgKzM5Nyw3IEBADQogICAgIF92aXNpdF9wYmMgKG9iaiwgbiAr
IDEsIHVpbnQxNl9mcm9tX2JlIChsb3QtPm9mZnNldFtuXSksIHRydWUsIGV4
dCk7DQogDQogICBfdmNkX2xpc3Rfc29ydCAoZXh0ID8gb2JqLT5vZmZzZXRf
eF9saXN0IDogb2JqLT5vZmZzZXRfbGlzdCwgDQotICAgICAgICAgICAgICAg
ICAgKF92Y2RfbGlzdF9jbXBfZnVuYykgX29mZnNldF90X2NtcCk7DQorICAg
ICAgICAgICAgICAgICAgKF92Y2RfbGlzdF9jbXBfZnVuYykgX3ZjZF9vZmZz
ZXRfdF9jbXApOw0KIH0NCiANCiBzdGF0aWMgdm9pZA0KQEAgLTQ1Miw3ICs0
NTIsNyBAQA0KIA0KICAgX1ZDRF9MSVNUX0ZPUkVBQ0ggKG5vZGUsIG9mZnNl
dF9saXN0KQ0KICAgICB7DQotICAgICAgb2Zmc2V0X3QgKm9mcyA9IF92Y2Rf
bGlzdF9ub2RlX2RhdGEgKG5vZGUpOw0KKyAgICAgIHZjZF9vZmZzZXRfdCAq
b2ZzID0gX3ZjZF9saXN0X25vZGVfZGF0YSAobm9kZSk7DQogICAgICAgdW5z
aWduZWQgX3JvZnMgPSBvZnMtPm9mZnNldCAqIG11bHQ7DQogDQogICAgICAg
dWludDhfdCB0eXBlOw0K
---276672395-520477076-1032249550=:13062--