Date: Sat, 19 Jul 2003 06:16:51 +0200 From: Simon Barner <barner@in.tum.de> To: Kris Kennaway <kris@obsecurity.org> Cc: current@FreeBSD.org Subject: Re: Fixing gcc 3.3 compile failures -- fix for x11/imwheel Message-ID: <20030719041651.GI467@zi025.glhnet.mhn.de> In-Reply-To: <20030718025200.GA36893@rot13.obsecurity.org> References: <20030718025200.GA36893@rot13.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--QRtLtq+kfJNLc57H
Content-Type: multipart/mixed; boundary="o99acAvKqrTZeiCU"
Content-Disposition: inline
--o99acAvKqrTZeiCU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
The attached patch includes the existing patch file patch-ab, which is
obsolete now.
--o99acAvKqrTZeiCU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-util.c"
Content-Transfer-Encoding: quoted-printable
--- util.c.orig Tue Oct 31 13:06:05 2000
+++ util.c Sat Jul 19 05:45:59 2003
@@ -330,11 +330,11 @@
fclose(f);
if(pid>0 && useFifo)
{
- fprintf(stderr,"\
-ERROR: imwheel is already running or there is a stale pid file
- check on processes listed below.
- run with -k to kill running imwheels.
- remove pid file %s.
+ fprintf(stderr,"\n\
+ERROR: imwheel is already running or there is a stale pid file\n\
+ check on processes listed below.\n\
+ run with -k to kill running imwheels.\n\
+ remove pid file %s.\n\
or run with -p to avoid the pid file altogether.\n",PIDFILE);
if((f=3Dfopen(PIDFILE,"r")))
{
@@ -710,7 +710,7 @@
=20
struct WinAction *getRC()
{
- char fname[2][1024]=3D{"","/etc/imwheelrc"}, line[1024], *p, *q, winid[10=
24];
+ char fname[2][1024]=3D{"","/usr/X11R6/etc/imwheelrc"}, line[1024], *p, *q=
, winid[1024];
int fi,i;
struct WinAction *newwa=3DNULL;
FILE *f=3DNULL;
--o99acAvKqrTZeiCU--
--QRtLtq+kfJNLc57H
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (FreeBSD)
iD8DBQE/GMYzCkn+/eutqCoRAnZXAJwI2eEjgiuvOpNOi4vJSgK20p8KmwCg+cIH
ANXdm2/J/oB0AjKvae2dfQA=
=+a8A
-----END PGP SIGNATURE-----
--QRtLtq+kfJNLc57H--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030719041651.GI467>