From: Erik Huelsmann <ehuels@...>
Date: 2005-05-14T21:58:29+09:00
Subject: Re: [PATCH] Win32: Ruby & APR; build problems for Ruby Subversion SWIG bindings

------=_Part_12179_12318085.1116075486055
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Thanks for the quick response!

> > Index: configure.in
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> > RCS file: /src/ruby/configure.in,v
> > retrieving revision 1.275
> > diff -u -r1.275 configure.in
> > --- configure.in      30 Apr 2005 02:59:41 -0000      1.275
> > +++ configure.in      14 May 2005 07:45:02 -0000
> > @@ -226,6 +226,8 @@
> >  AC_CHECK_SIZEOF(double, 8)
> >  AC_CHECK_SIZEOF(time_t, 0)
> >
> > +AC_CHECK_TYPES([pid_t, gid_t, uid_t])
>=20
> I think AC_TYPE_UID_T and AC_TYPE_PID_T also would be=20
> needed to remove.

Yes. Though I have not been able to find any reference to
AC_TYPE_PID_T, I did remove AC_TYPE_UID_T.

> > Index: process.c
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> > RCS file: /src/ruby/process.c,v
> > retrieving revision 1.129
> > diff -u -r1.129 process.c
> > --- process.c 4 Mar 2005 06:47:41 -0000       1.129
> > +++ process.c 14 May 2005 07:45:03 -0000
> > @@ -1847,14 +1847,14 @@
> >      if (pid < 0) rb_sys_fail(0);
> >      return INT2FIX(pid);
> >  #elif defined(HAVE_SETPGRP) && defined(TIOCNOTTY)
> > -  pid_t pid;
> > +  rb_pid_t pid;
> >    int ret;
> >
> >    rb_secure(2);
> >    pid =3D getpid();
> >  #if defined(SETPGRP_VOID)
> >    ret =3D setpgrp();
> > -  /* If `pid_t setpgrp(void)' is equivalent to setsid(),
> > +  /* If `rb_pid_t setpgrp(void)' is equivalent to setsid(),
>=20
> This is overdone, isn't it?

Yes. removed.
=20
> > Index: ruby.h
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> > RCS file: /src/ruby/ruby.h,v
> > retrieving revision 1.111
> > diff -u -r1.111 ruby.h
> > --- ruby.h    30 Apr 2005 02:59:41 -0000      1.111
> > +++ ruby.h    14 May 2005 07:45:03 -0000
> > @@ -82,6 +82,25 @@
> >  typedef unsigned long VALUE;
> >  typedef unsigned long ID;
> >
> > +#if ! HAVE_PID_T
> > +  typedef int rb_pid_t;
> > +#else
> > +  typedef pid_t rb_pid_t;
> > +#endif
>=20
> Why not #ifdef?
Error on my part. Corrected in the attached patch.


Updated patch attached.

The log:

[[[
Resolve possible type definition conflicts by defining types in
the rb_ namespace instead of defining POSIX type names.

* configure.in: Check for the availability of pid_t, gid_t and uid_t and
  remove AC_TYPE_UID_T.

* defines.h: Remove pid_t typedef.

* ruby.h: Define rb_pid_t, rb_gid_t and rb_uid_t in accordance with
 the available system types.

* process.c: Change instances of pid_t and gid_t to their rb_*
 counterparts.

* ext/pty/pty.c: Change pid_t to rb_pid_t.

* vms/config.h: Define HAVE_{P,G,U}ID_T to 1.

* win32/Makefile.sub: Remove #define for {g,u}id_t.

* win32/win32.c: Change pid_t to rb_pid_t.

* wince/Makefile.sub: Remove #define for {g,u}id_t.

* wince/sys/types.h: Remove definitions of {p,g,u}id_t.

]]]

------=_Part_12179_12318085.1116075486055
Content-Type: application/octet-stream; name="non-conflicting-defines.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="non-conflicting-defines.diff"

PyBub24tY29uZmxpY3RpbmctZGVmaW5lcy5kaWZmCj8gZXh0L2RsL2NhbGxiYWNrLmgKPyBleHQv
cmlwcGVyL21rbWYubG9nCj8gZXh0L3JpcHBlci9yaXBwZXIub3V0cHV0Cj8gZXh0L3NvY2tldC9j
b25zdGFudHMuaApJbmRleDogY29uZmlndXJlLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9zcmMv
cnVieS9jb25maWd1cmUuaW4sdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjc1CmRpZmYgLXUgLXIx
LjI3NSBjb25maWd1cmUuaW4KLS0tIGNvbmZpZ3VyZS5pbgkzMCBBcHIgMjAwNSAwMjo1OTo0MSAt
MDAwMAkxLjI3NQorKysgY29uZmlndXJlLmluCTE0IE1heSAyMDA1IDEyOjU3OjQ5IC0wMDAwCkBA
IC0yMjYsNiArMjI2LDggQEAKIEFDX0NIRUNLX1NJWkVPRihkb3VibGUsIDgpCiBBQ19DSEVDS19T
SVpFT0YodGltZV90LCAwKQogCitBQ19DSEVDS19UWVBFUyhbcGlkX3QsIGdpZF90LCB1aWRfdF0p
CisKIEFDX0NBQ0hFX0NIRUNLKGZvciBwcm90b3R5cGVzLCByYl9jdl9oYXZlX3Byb3RvdHlwZXMs
CiAgIFtBQ19UUllfQ09NUElMRShbaW50IGZvbyhpbnQgeCkgeyByZXR1cm4gMDsgfV0sIFtyZXR1
cm4gZm9vKDEwKTtdLAogCXJiX2N2X2hhdmVfcHJvdG90eXBlcz15ZXMsCkBAIC00NTQsNyArNDU2
LDYgQEAKIF0pCiAKIGRubCBDaGVja3MgZm9yIHR5cGVkZWZzLCBzdHJ1Y3R1cmVzLCBhbmQgY29t
cGlsZXIgY2hhcmFjdGVyaXN0aWNzLgotQUNfVFlQRV9VSURfVAogQUNfVFlQRV9TSVpFX1QKIEFD
X1NUUlVDVF9TVF9CTEtTSVpFCiBBQ19TVFJVQ1RfU1RfQkxPQ0tTCkluZGV4OiBkZWZpbmVzLmgK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQpSQ1MgZmlsZTogL3NyYy9ydWJ5L2RlZmluZXMuaCx2CnJldHJpZXZpbmcgcmV2
aXNpb24gMS40MQpkaWZmIC11IC1yMS40MSBkZWZpbmVzLmgKLS0tIGRlZmluZXMuaAkxNCBBcHIg
MjAwNCAwMjowMzoxNSAtMDAwMAkxLjQxCisrKyBkZWZpbmVzLmgJMTQgTWF5IDIwMDUgMTI6NTc6
NDkgLTAwMDAKQEAgLTE3Niw3ICsxNzYsNiBAQAogI2lmbmRlZiBYX09LCiAjZGVmaW5lIFhfT0sg
MQogI2VuZGlmCi10eXBlZGVmIGludCBwaWRfdDsKICNlbmRpZiAvKiBfX0FQUExFX18gKi8KICNl
bmRpZiAvKiBOZVhUICovCiAKSW5kZXg6IHByb2Nlc3MuYwo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAv
c3JjL3J1YnkvcHJvY2Vzcy5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjEyOQpkaWZmIC11IC1y
MS4xMjkgcHJvY2Vzcy5jCi0tLSBwcm9jZXNzLmMJNCBNYXIgMjAwNSAwNjo0Nzo0MSAtMDAwMAkx
LjEyOQorKysgcHJvY2Vzcy5jCTE0IE1heSAyMDA1IDEyOjU3OjUwIC0wMDAwCkBAIC0xODQ3LDcg
KzE4NDcsNyBAQAogICAgIGlmIChwaWQgPCAwKSByYl9zeXNfZmFpbCgwKTsKICAgICByZXR1cm4g
SU5UMkZJWChwaWQpOwogI2VsaWYgZGVmaW5lZChIQVZFX1NFVFBHUlApICYmIGRlZmluZWQoVElP
Q05PVFRZKQotICBwaWRfdCBwaWQ7CisgIHJiX3BpZF90IHBpZDsKICAgaW50IHJldDsKIAogICBy
Yl9zZWN1cmUoMik7CkBAIC0yNjQyLDEwICsyNjQyLDEwIEBACiAjaWZkZWYgSEFWRV9HRVRHUk9V
UFMKICAgICBWQUxVRSBhcnk7CiAgICAgc2l6ZV90IG5ncm91cHM7Ci0gICAgZ2lkX3QgKmdyb3Vw
czsKKyAgICByYl9naWRfdCAqZ3JvdXBzOwogICAgIGludCBpOwogCi0gICAgZ3JvdXBzID0gQUxM
T0NBX04oZ2lkX3QsIG1heGdyb3Vwcyk7CisgICAgZ3JvdXBzID0gQUxMT0NBX04ocmJfZ2lkX3Qs
IG1heGdyb3Vwcyk7CiAKICAgICBuZ3JvdXBzID0gZ2V0Z3JvdXBzKG1heGdyb3VwcywgZ3JvdXBz
KTsKICAgICBpZiAobmdyb3VwcyA9PSAtMSkKQEAgLTI2ODEsNyArMjY4MSw3IEBACiB7CiAjaWZk
ZWYgSEFWRV9TRVRHUk9VUFMKICAgICBzaXplX3Qgbmdyb3VwczsKLSAgICBnaWRfdCAqZ3JvdXBz
OworICAgIHJiX2dpZF90ICpncm91cHM7CiAgICAgaW50IGk7CiAgICAgc3RydWN0IGdyb3VwICpn
cjsKIApAQCAtMjY5MSw3ICsyNjkxLDcgQEAKICAgICBpZiAobmdyb3VwcyA+IG1heGdyb3VwcykK
IAlyYl9yYWlzZShyYl9lQXJnRXJyb3IsICJ0b28gbWFueSBncm91cHMsICVkIG1heCIsIG1heGdy
b3Vwcyk7CiAKLSAgICBncm91cHMgPSBBTExPQ0FfTihnaWRfdCwgbmdyb3Vwcyk7CisgICAgZ3Jv
dXBzID0gQUxMT0NBX04ocmJfZ2lkX3QsIG5ncm91cHMpOwogCiAgICAgZm9yIChpID0gMDsgaSA8
IG5ncm91cHMgJiYgaSA8IFJBUlJBWShhcnkpLT5sZW47IGkrKykgewogCVZBTFVFIGcgPSBSQVJS
QVkoYXJ5KS0+cHRyW2ldOwpAQCAtMjc0OSw3ICsyNzQ5LDcgQEAKICAgICBWQUxVRSBvYmosIHVu
YW1lLCBiYXNlX2dycDsKIHsKICNpZmRlZiBIQVZFX0lOSVRHUk9VUFMKLSAgICBpZiAoaW5pdGdy
b3VwcyhTdHJpbmdWYWx1ZVB0cih1bmFtZSksIChnaWRfdClOVU0ySU5UKGJhc2VfZ3JwKSkgIT0g
MCkgeworICAgIGlmIChpbml0Z3JvdXBzKFN0cmluZ1ZhbHVlUHRyKHVuYW1lKSwgKHJiX2dpZF90
KU5VTTJJTlQoYmFzZV9ncnApKSAhPSAwKSB7CiAJcmJfc3lzX2ZhaWwoMCk7CiAgICAgfQogICAg
IHJldHVybiBwcm9jX2dldGdyb3VwcyhvYmopOwpJbmRleDogcnVieS5oCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNT
IGZpbGU6IC9zcmMvcnVieS9ydWJ5LmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTExCmRpZmYg
LXUgLXIxLjExMSBydWJ5LmgKLS0tIHJ1YnkuaAkzMCBBcHIgMjAwNSAwMjo1OTo0MSAtMDAwMAkx
LjExMQorKysgcnVieS5oCTE0IE1heSAyMDA1IDEyOjU3OjUwIC0wMDAwCkBAIC04Miw2ICs4Miwy
NSBAQAogdHlwZWRlZiB1bnNpZ25lZCBsb25nIFZBTFVFOwogdHlwZWRlZiB1bnNpZ25lZCBsb25n
IElEOwogCisjaWZkZWYgSEFWRV9QSURfVAorICB0eXBlZGVmIGludCByYl9waWRfdDsKKyNlbHNl
CisgIHR5cGVkZWYgcGlkX3QgcmJfcGlkX3Q7CisjZW5kaWYKKworI2lmZGVmIEhBVkVfR0lEX1QK
KyAgdHlwZWRlZiBpbnQgcmJfZ2lkX3Q7CisjZWxzZQorICB0eXBlZGVmIGdpZF90IHJiX2dpZF90
OworI2VuZGlmCisKKyNpZmRlZiBIQVZFX1VJRF9UCisgIHR5cGVkZWYgaW50IHJiX3VpZF90Owor
I2Vsc2UKKyAgdHlwZWRlZiB1aWRfdCByYl91aWRfdDsKKyNlbmRpZgorCisKICNpZmRlZiBfX1NU
RENfXwogIyBpbmNsdWRlIDxsaW1pdHMuaD4KICNlbHNlCkluZGV4OiBleHQvcHR5L3B0eS5jCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KUkNTIGZpbGU6IC9zcmMvcnVieS9leHQvcHR5L3B0eS5jLHYKcmV0cmlldmluZyBy
ZXZpc2lvbiAxLjIyCmRpZmYgLXUgLXIxLjIyIHB0eS5jCi0tLSBleHQvcHR5L3B0eS5jCTQgTWFy
IDIwMDUgMDY6NDc6MzggLTAwMDAJMS4yMgorKysgZXh0L3B0eS9wdHkuYwkxNCBNYXkgMjAwNSAx
Mjo1Nzo1MCAtMDAwMApAQCAtMTI4LDcgKzEyOCw3IEBACiAKIHN0cnVjdCBwdHlfaW5mbyB7CiAg
ICAgaW50IGZkOwotICAgIHBpZF90IGNoaWxkX3BpZDsKKyAgICByYl9waWRfdCBjaGlsZF9waWQ7
CiAgICAgVkFMVUUgdGhyZWFkOwogfTsKIApJbmRleDogdm1zL2NvbmZpZy5oCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
UkNTIGZpbGU6IC9zcmMvcnVieS92bXMvY29uZmlnLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEu
MQpkaWZmIC11IC1yMS4xIGNvbmZpZy5oCi0tLSB2bXMvY29uZmlnLmgJMjYgRGVjIDIwMDMgMDE6
Mzk6MjUgLTAwMDAJMS4xCisrKyB2bXMvY29uZmlnLmgJMTQgTWF5IDIwMDUgMTI6NTc6NTEgLTAw
MDAKQEAgLTIzLDYgKzIzLDkgQEAKICNkZWZpbmUgSEFWRV9HRVRQR1JQIDEKIC8qICNkZWZpbmUg
SEFWRV9HRVRQUklPUklUWSAxICovCiAvKiAjZGVmaW5lIEhBVkVfR0VUUkxJTUlUIDEgKi8KKyNk
ZWZpbmUgSEFWRV9QSURfVCAxCisjZGVmaW5lIEhBVkVfR0lEX1QgMQorI2RlZmluZSBIQVZFX1VJ
RF9UIDEKICNkZWZpbmUgSEFWRV9IWVBPVCAxCiAjZGVmaW5lIEhBVkVfSVNBU0NJSSAxCiAvKiAj
ZGVmaW5lIEhBVkVfSVNJTkYgMSAqLwpJbmRleDogd2luMzIvTWFrZWZpbGUuc3ViCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KUkNTIGZpbGU6IC9zcmMvcnVieS93aW4zMi9NYWtlZmlsZS5zdWIsdgpyZXRyaWV2aW5nIHJl
dmlzaW9uIDEuOTQKZGlmZiAtdSAtcjEuOTQgTWFrZWZpbGUuc3ViCi0tLSB3aW4zMi9NYWtlZmls
ZS5zdWIJMTMgTWF5IDIwMDUgMTQ6NDQ6NDMgLTAwMDAJMS45NAorKysgd2luMzIvTWFrZWZpbGUu
c3ViCTE0IE1heSAyMDA1IDEyOjU3OjUxIC0wMDAwCkBAIC0yMjksOCArMjI5LDYgQEAKICNkZWZp
bmUgSEFWRV9GQ05UTF9IIDEKICNkZWZpbmUgSEFWRV9TWVNfVVRJTUVfSCAxCiAjZGVmaW5lIEhB
VkVfRkxPQVRfSCAxCi0jZGVmaW5lIHVpZF90IGludAotI2RlZmluZSBnaWRfdCBpbnQKICNkZWZp
bmUgSEFWRV9TVFJVQ1RfU1RBVF9TVF9SREVWIDEKICNkZWZpbmUgSEFWRV9TVF9SREVWIDEKICNk
ZWZpbmUgR0VUR1JPVVBTX1QgaW50CkluZGV4OiB3aW4zMi93aW4zMi5jCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNT
IGZpbGU6IC9zcmMvcnVieS93aW4zMi93aW4zMi5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE0
NwpkaWZmIC11IC1yMS4xNDcgd2luMzIuYwotLS0gd2luMzIvd2luMzIuYwk1IE1hciAyMDA1IDA5
OjMwOjI0IC0wMDAwCTEuMTQ3CisrKyB3aW4zMi93aW4zMi5jCTE0IE1heSAyMDA1IDEyOjU3OjUy
IC0wMDAwCkBAIC00NDUsNyArNDQ1LDcgQEAKIAogc3RhdGljIHN0cnVjdCBDaGlsZFJlY29yZCB7
CiAgICAgSEFORExFIGhQcm9jZXNzOwkvKiBwcm9jZXNzIGhhbmRsZSAqLwotICAgIHBpZF90IHBp
ZDsJCS8qIHByb2Nlc3MgaWQgKi8KKyAgICByYl9waWRfdCBwaWQ7CS8qIHByb2Nlc3MgaWQgKi8K
IH0gQ2hpbGRSZWNvcmRbTUFYQ0hJTEROVU1dOwogCiAjZGVmaW5lIEZPUkVBQ0hfQ0hJTEQodikg
ZG8geyBcCkBAIC00NjMsNyArNDYzLDcgQEAKIH0KIAogc3RhdGljIHN0cnVjdCBDaGlsZFJlY29y
ZCAqCi1GaW5kQ2hpbGRTbG90KHBpZF90IHBpZCkKK0ZpbmRDaGlsZFNsb3QocmJfcGlkX3QgcGlk
KQogewogCiAgICAgRk9SRUFDSF9DSElMRChjaGlsZCkgewpAQCAtNjc4LDcgKzY3OCw3IEBACiAK
IHN0YXRpYyBpbnQgc29ja2V0cGFpcl9pbnRlcm5hbChpbnQgYWYsIGludCB0eXBlLCBpbnQgcHJv
dG9jb2wsIFNPQ0tFVCAqc3YpOwogCi1waWRfdAorcmJfcGlkX3QKIHJiX3czMl9waXBlX2V4ZWMo
Y29uc3QgY2hhciAqY21kLCBjb25zdCBjaGFyICpwcm9nLCBpbnQgbW9kZSwgaW50ICpwaXBlKQog
ewogICAgIHN0cnVjdCBDaGlsZFJlY29yZCogY2hpbGQ7CkBAIC05ODcsNyArOTg3LDcgQEAKICAg
ICBDbG9zZUhhbmRsZShhUHJvY2Vzc0luZm9ybWF0aW9uLmhUaHJlYWQpOwogCiAgICAgY2hpbGQt
PmhQcm9jZXNzID0gYVByb2Nlc3NJbmZvcm1hdGlvbi5oUHJvY2VzczsKLSAgICBjaGlsZC0+cGlk
ID0gKHBpZF90KWFQcm9jZXNzSW5mb3JtYXRpb24uZHdQcm9jZXNzSWQ7CisgICAgY2hpbGQtPnBp
ZCA9IChyYl9waWRfdClhUHJvY2Vzc0luZm9ybWF0aW9uLmR3UHJvY2Vzc0lkOwogCiAgICAgaWYg
KCFJc1dpbk5UKCkpIHsKIAkvKiBPbiBXaW45eCwgbWFrZSBwaWQgcG9zaXRpdmUgc2ltaWxhcmx5
IHRvIGN5Z3dpbiBhbmQgcGVybCAqLwpAQCAtMjU3Nyw3ICsyNTc3LDcgQEAKICNkZWZpbmUgV05P
SEFORyAtMQogI2VuZGlmCiAKLXN0YXRpYyBwaWRfdAorc3RhdGljIHJiX3BpZF90CiBwb2xsX2No
aWxkX3N0YXR1cyhzdHJ1Y3QgQ2hpbGRSZWNvcmQgKmNoaWxkLCBpbnQgKnN0YXRfbG9jKQogewog
ICAgIERXT1JEIGV4aXRjb2RlOwpAQCAtMjU5NSw3ICsyNTk1LDcgQEAKICAgICB9CiAgICAgaWYg
KGV4aXRjb2RlICE9IFNUSUxMX0FDVElWRSkgewogCS8qIElmIGFscmVhZHkgZGllZCwgcmV0dXJu
IGltbWVkaWF0bHkuICovCi0JcGlkX3QgcGlkID0gY2hpbGQtPnBpZDsKKwlyYl9waWRfdCBwaWQg
PSBjaGlsZC0+cGlkOwogCUNsb3NlQ2hpbGRIYW5kbGUoY2hpbGQpOwogCWlmIChzdGF0X2xvYykg
KnN0YXRfbG9jID0gZXhpdGNvZGUgPDwgODsKIAlyZXR1cm4gcGlkOwpAQCAtMjYwMyw4ICsyNjAz
LDggQEAKICAgICByZXR1cm4gMDsKIH0KIAotcGlkX3QKLXdhaXRwaWQgKHBpZF90IHBpZCwgaW50
ICpzdGF0X2xvYywgaW50IG9wdGlvbnMpCityYl9waWRfdAord2FpdHBpZCAocmJfcGlkX3QgcGlk
LCBpbnQgKnN0YXRfbG9jLCBpbnQgb3B0aW9ucykKIHsKICAgICBEV09SRCB0aW1lb3V0OwogCkBA
IC0zNDM1LDEwICszNDM1LDEwIEBACiB9CiAKICN1bmRlZiBnZXRwaWQKLXBpZF90CityYl9waWRf
dAogcmJfdzMyX2dldHBpZCh2b2lkKQogewotICAgIHBpZF90IHBpZDsKKyAgICByYl9waWRfdCBw
aWQ7CiAKICAgICBwaWQgPSBnZXRwaWQoKTsKIApJbmRleDogd2luY2UvTWFrZWZpbGUuc3ViCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KUkNTIGZpbGU6IC9zcmMvcnVieS93aW5jZS9NYWtlZmlsZS5zdWIsdgpyZXRyaWV2
aW5nIHJldmlzaW9uIDEuMzgKZGlmZiAtdSAtcjEuMzggTWFrZWZpbGUuc3ViCi0tLSB3aW5jZS9N
YWtlZmlsZS5zdWIJMTMgTWF5IDIwMDUgMTQ6NDQ6NDMgLTAwMDAJMS4zOAorKysgd2luY2UvTWFr
ZWZpbGUuc3ViCTE0IE1heSAyMDA1IDEyOjU3OjUyIC0wMDAwCkBAIC0yMzEsOCArMjMxLDYgQEAK
ICNkZWZpbmUgSEFWRV9GQ05UTF9IIDEKICNkZWZpbmUgSEFWRV9TWVNfVVRJTUVfSCAxCiAjZGVm
aW5lIEhBVkVfRkxPQVRfSCAxCi0jZGVmaW5lIHVpZF90IGludAotI2RlZmluZSBnaWRfdCBpbnQK
ICNkZWZpbmUgSEFWRV9TVFJVQ1RfU1RBVF9TVF9SREVWIDEKICNkZWZpbmUgSEFWRV9TVF9SREVW
IDEKICNkZWZpbmUgR0VUR1JPVVBTX1QgaW50CkluZGV4OiB3aW5jZS9zeXMvdHlwZXMuaAo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09ClJDUyBmaWxlOiAvc3JjL3J1Ynkvd2luY2Uvc3lzL3R5cGVzLmgsdgpyZXRyaWV2aW5n
IHJldmlzaW9uIDEuMQpkaWZmIC11IC1yMS4xIHR5cGVzLmgKLS0tIHdpbmNlL3N5cy90eXBlcy5o
CTE0IERlYyAyMDAyIDA1OjI3OjM1IC0wMDAwCTEuMQorKysgd2luY2Uvc3lzL3R5cGVzLmgJMTQg
TWF5IDIwMDUgMTI6NTc6NTIgLTAwMDAKQEAgLTE5LDggKzE5LDYgQEAKICAgI2RlZmluZSBfTU9E
RV9UX0RFRklORURfCiAjZW5kaWYKIAotLy90eXBlZGVmIHVuc2lnbmVkIHNob3J0IGdpZF90Owot
Ly90eXBlZGVmIHVuc2lnbmVkIHNob3J0IHVpZF90OwogdHlwZWRlZiBsb25nIGNsb2NrX3Q7CiAK
ICNpZm5kZWYgX1BUUkRJRkZfVF9ERUZJTkVECkBAIC01OCwxMCArNTYsNSBAQAogLy90eXBlZGVm
IHVuc2lnbmVkIGxvbmcgdGltZV90OwogLy8jZGVmaW5lIF9USU1FX1RfREVGSU5FRF8KIC8vI2Vu
ZGlmCi0KLSNpZm5kZWYgX1BJRF9UX0RFRklORURfCi10eXBlZGVmIHVuc2lnbmVkIGxvbmcgcGlk
X3Q7Ci0jZGVmaW5lIF9QSURfVF9ERUZJTkVEXwotI2VuZGlmCiAKICNlbmRpZgo=
------=_Part_12179_12318085.1116075486055--