jbm@ucbvax.berkeley.edu (10/16/88)
Thanks for the 'diff' utility - now we in System V Land can do context diffs like our BSD playmates. Speedy, too. FYI: the little I had to do to get it running on System V/386 R3.2 follows. The Makefile changes are obviously included for reference rather than as a suggestion of exactly what the distributed Makefile should look like; the problem addressed was a need for alloca(). As for the file.h : types.h order dependency addressed in diff.h: I don't know how widespread it is. I may have overgeneralized in making the swap dependent only on USG*, or I may have undergeneralized - does the swap break a BSD compile? -Jeff Moore ([ucbvax!]attunix!jbm) * [I'm sure you're aware that 'USG' is a thoroughly archaic reference...] ----- diffs follow ----- diff -c orig/Makefile hacked/Makefile *** orig/Makefile Thu Oct 6 12:36:08 1988 --- hacked/Makefile Tue Oct 11 13:36:10 1988 *************** *** 21,28 **** # You can compile this with ordinary cc as well, # but gcc makes it faster. ! CC=gcc -O ! CFLAGS = -g bindir=/usr/local/bin prefix= --- 21,29 ---- # You can compile this with ordinary cc as well, # but gcc makes it faster. ! #CC=gcc -O ! CFLAGS = -DUSG -O ! LDLIBS = -lPW bindir=/usr/local/bin prefix= *************** *** 33,39 **** tapefiles = $(srcs) README diagmeet.note Makefile COPYING diff: $(objs) ! $(CC) -o diff $(CFLAGS) $(LDFLAGS) $(objs) $(objs): diff.h --- 34,40 ---- tapefiles = $(srcs) README diagmeet.note Makefile COPYING diff: $(objs) ! $(CC) -o diff $(CFLAGS) $(LDFLAGS) $(objs) $(LDLIBS) $(objs): diff.h diff -c orig/diff.h hacked/diff.h *** orig/diff.h Fri Oct 7 02:39:37 1988 --- hacked/diff.h Mon Oct 10 17:45:24 1988 *************** *** 21,28 **** --- 21,33 ---- #include <ctype.h> #include <stdio.h> + #ifdef USG + #include <sys/types.h> + #include <sys/file.h> + #else #include <sys/file.h> #include <sys/types.h> + #endif #include <sys/stat.h> #ifdef USG