1--- cksum/cksum.c
2+++ cksum/cksum.c
3@@ -147,7 +147,7 @@ cksum(const char *name)
4 s = (s << 8) ^ crctab[(s >> 24) ^ c];
5 }
6 s = ~s;
7- printf("%u %llu", (unsigned)s, nbytes);
8+ printf("%u %lu", (unsigned)s, nbytes);
9 if(name)
10 printf(" %s", name);
11 printf("\n");
12--- cmp/cmp.c
13+++ cmp/cmp.c
14@@ -246,8 +246,8 @@ different:
15 errcnt = 1;
16 } else {
17 if (sflag == 0)
18- printf("%s %s differ: char %lld,"
19- " line %lld\n",
20+ printf("%s %s differ: char %ld,"
21+ " line %ld\n",
22 f1->f_nam, f2->f_nam,
23 (long long)offset(f1),
24 line);
25--- csplit/csplit.c
26+++ csplit/csplit.c
27@@ -284,7 +284,7 @@ csplit(const char *fn)
28 op = nextfile();
29 if (op) {
30 if (!sflag)
31- printf("%lld\n", bytes);
32+ printf("%ld\n", bytes);
33 bytes = 0;
34 fclose(op);
35 }
36--- expr/expr.y
37+++ expr/expr.y
38@@ -140,7 +140,7 @@ expression: expr NOARG {
39 if (sus && numeric($1)) {
40 int64_t n;
41 n = atoll($1);
42- printf("%lld\n", n);
43+ printf("%ld\n", n);
44 exit(n == 0);
45 } else
46 puts($1);
47@@ -447,10 +447,10 @@ numpr(int64_t val)
48 int ret;
49
50 rv = smalloc(NUMSZ);
51- ret = snprintf(rv, NUMSZ, "%lld", (long long)val);
52+ ret = snprintf(rv, NUMSZ, "%ld", (long long)val);
53 if (ret < 0 || ret >= NUMSZ) {
54 rv = srealloc(rv, ret + 1);
55- ret = snprintf(rv, ret, "%lld", (long long)val);
56+ ret = snprintf(rv, ret, "%ld", (long long)val);
57 if (ret < 0)
58 yyerror("illegal number");
59 }
60--- grep/Makefile.mk
61+++ grep/Makefile.mk
62@@ -92,7 +92,7 @@ config.h:
63 -echo 'long long foo;' >___build$$$$.c ; \
64 $(CC) $(CFLAGS2) $(CPPFLAGS) $(IWCHAR) $(ICOMMON) $(IUXRE) $(LARGEF) -c ___build$$$$.c >/dev/null 2>&1 ; \
65 if test $$? = 0 && test -f ___build$$$$.o ; \
66- then echo '#define LONGLONG' >>config.h ; \
67+ then echo '' >>config.h ; \
68 fi ; \
69 rm -f ___build$$$$.o ___build$$$$.c
70
71--- ls/Makefile.mk
72+++ ls/Makefile.mk
73@@ -76,7 +76,7 @@ config.h:
74 -echo 'long long foo;' >___build$$$$.c ; \
75 $(CC) $(CFLAGS) $(CPPFLAGS) $(LARGEF) $(IWCHAR) -c ___build$$$$.c >/dev/null 2>&1 ; \
76 if test $$? = 0 && test -f ___build$$$$.o ; \
77- then echo '#define LONGLONG' >>config.h ; \
78+ then echo '' >>config.h ; \
79 fi ; \
80 rm -f ___build$$$$.o ___build$$$$.c
81 -echo '#include <sys/types.h>' >___build$$$$.c ; \
82--- pr/pr.c
83+++ pr/pr.c
84@@ -548,7 +548,7 @@ print(const char *fp, const char **argp)
85 putcs(" ");
86 putcs(header);
87 snprintf(linebuf, sizeof linebuf,
88- " Page %lld\n\n\n", page);
89+ " Page %ld\n\n\n", page);
90 putcs(linebuf);
91 }
92 c = putpage();
93--- sed/sed1.c
94+++ sed/sed1.c
95@@ -489,7 +489,7 @@ command(struct reptr *ipc)
96 break;
97
98 case EQCOM:
99- fprintf(stdout, "%lld\n", lnum);
100+ fprintf(stdout, "%ld\n", lnum);
101 break;
102
103 case GCOM:
104--- sum/sum.c
105+++ sum/sum.c
106@@ -116,7 +116,7 @@ sum(const char *name)
107 else {
108 s = (s & 0xFFFF) + (s >> 16);
109 s = (s & 0xFFFF) + (s >> 16);
110- printf("%u %llu", (unsigned)s,
111+ printf("%u %lu", (unsigned)s,
112 (unsigned long long)(nbytes+UNIT-1)/UNIT);
113 }
114 if(name)
115--- wc/wc.c
116+++ wc/wc.c
117@@ -89,9 +89,9 @@ report(unsigned long long count)
118 #if defined (S42)
119 if (putspace++)
120 printf(" ");
121- printf("%llu", count);
122+ printf("%lu", count);
123 #else /* !S42 */
124- printf("%7llu ", count);
125+ printf("%7lu ", count);
126 #endif /* !S42 */
127 }
128