41c41
< __FBSDID("$FreeBSD: head/bin/sh/expand.c 213760 2010-10-13 04:01:01Z obrien $");
---
> __FBSDID("$FreeBSD: head/bin/sh/expand.c 213775 2010-10-13 13:22:11Z jhb $");
46d45
< #include <errno.h>
48,50c47,48
< #include <unistd.h>
< #include <pwd.h>
< #include <stdlib.h>
---
> #include <errno.h>
> #include <inttypes.h>
51a50
> #include <pwd.h>
52a52
> #include <stdlib.h>
53a54
> #include <unistd.h>
500,502c501,503
< TRACE(("evalbackq: size=%d: \"%.*s\"\n",
< (dest - stackblock()) - startloc,
< (dest - stackblock()) - startloc,
---
> TRACE(("expbackq: size=%td: \"%.*s\"\n",
> ((dest - stackblock()) - startloc),
> (int)((dest - stackblock()) - startloc),