Date: Sun, 14 Nov 2010 11:36:45 -0500 From: jhell <jhell@DataIX.net> To: Jilles Tjoelker <jilles@freebsd.org>, FreeBSD Current <current@freebsd.org> Subject: head/bin/sh/output.h r215303 Message-ID: <4CE0101D.4020600@DataIX.net>
next in thread | raw e-mail | index | archive | help
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hey Jilles, I just merged some of the changes to stable/8 of bin/sh, specifically all the recent changes that happened. In revision 215303 it shows that you added stddef.h as an include to output.h while jobs.c includes both output.h and stddef.h resulting in 'offsetof' being redefined. This fixes the problem, diff -r e16f819581a1 bin/sh/jobs.c - --- a/bin/sh/jobs.c Sun Nov 14 11:07:41 2010 -0500 +++ b/bin/sh/jobs.c Sun Nov 14 11:35:11 2010 -0500 @@ -41,7 +41,6 @@ #include <sys/ioctl.h> #include <sys/param.h> #include <sys/resource.h> - -#include <sys/stddef.h> #include <sys/time.h> #include <sys/wait.h> #include <errno.h> - -- jhell,v -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJM4BAdAAoJEJBXh4mJ2FR+2soH/1wsPWvw8fM2mzlYcfch51LA nOC7CLxDw1tirMmH/TeVmG1vZt0l1HbW15c3wuxgjLt1ubDiAGiR4FRFj0LIz4FS xtnHlpT4HednVBxRflqhPr1KoJWNoM94r3GF93DwHpYsMTpThtWoV1RpnPW9ZrNs +IaooRECQazDnb5ctQq64ysrzTTmqw9khRRS8ovGTjOQCNaHA1/68rTVpj6Kykne OqlVHFRnxqdaC/+yxocyWpAk4T4zPzTz4H7kTdiWcGhphjuhJPtTFweJPQpD4VV/ QkNecRocgYp0fDB3wjhCqu4QN2AF48AveKtbAYlFKC92//8ShXDGdTOCID3CeLs= =63/p -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4CE0101D.4020600>