diff -ur ../urt-3.1b-orig/get/getx11/in_cmap.c ./get/getx11/in_cmap.c --- ../urt-3.1b-orig/get/getx11/in_cmap.c Thu Apr 30 10:17:16 1992 +++ ./get/getx11/in_cmap.c Sat Sep 16 11:16:59 1995 @@ -70,10 +70,10 @@ if ( img->sep_colors || (img->img_channels == 1 && img->ncmap == 3 && img->cmlen) ) /* If using color map directly, apply display gamma, too. */ - img->in_cmap = buildmap( img_hdr, 3, img->gamma, + img->in_cmap = buildmap( img_hdr, 3, (double) img->gamma, display_gamma ); else - img->in_cmap = buildmap( img_hdr, 3, img->gamma, 1.0 ); + img->in_cmap = buildmap( img_hdr, 3, (double) img->gamma, 1.0 ); for (i = 0; i < 3; i++ ) { for (j = 0; j < 256; j++) diff -ur ../urt-3.1b-orig/include/rle_config.tlr ./include/rle_config.tlr --- ../urt-3.1b-orig/include/rle_config.tlr Thu Apr 30 10:06:23 1992 +++ ./include/rle_config.tlr Sat Sep 16 11:31:57 1995 @@ -48,7 +48,7 @@ #endif /* NO_DECLARE_MALLOC */ #ifdef USE_PROTOTYPES -extern char *getenv( CONST_DECL char *name ); +extern char *getenv( CONST_DECL char *CONST_DECL name); #else extern char *getenv(); #endif diff -ur ../urt-3.1b-orig/lib/buildmap.c ./lib/buildmap.c --- ../urt-3.1b-orig/lib/buildmap.c Thu Feb 27 18:17:01 1992 +++ ./lib/buildmap.c Sat Sep 16 12:11:12 1995 @@ -26,6 +26,7 @@ */ #include +#include #include "rle.h" #include diff -ur ../urt-3.1b-orig/makefile.src ./makefile.src --- ../urt-3.1b-orig/makefile.src Fri Jun 7 11:58:13 1991 +++ ./makefile.src Fri Sep 15 22:09:01 1995 @@ -17,7 +17,7 @@ # clean deletes all but source, pristine (below) deletes installed stuff, too default clean: doit @for d in $(DIRS) ; do \ - ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ + ( cd $$d ; echo make $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ done # install puts library, binaries and documentation into global location @@ -29,7 +29,7 @@ install $(MAKE_TARGET) pristine depend:: doit @for d in $(ALLDIRS) ; do \ - ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ + ( cd $$d ; echo make $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ done diff -ur ../urt-3.1b-orig/tools/into.c ./tools/into.c --- ../urt-3.1b-orig/tools/into.c Thu Apr 30 10:10:15 1992 +++ ./tools/into.c Sat Sep 16 10:32:26 1995 @@ -41,7 +41,10 @@ short forceflg; /* overwrite an unwritable file? */ extern int errno; + +#ifndef BSD extern char *sys_errlist[]; +#endif void main(argc, argv) diff -ur ../urt-3.1b-orig/tools/makefile.src ./tools/makefile.src --- ../urt-3.1b-orig/tools/makefile.src Tue Jan 28 15:47:42 1992 +++ ./tools/makefile.src Sat Sep 16 10:33:14 1995 @@ -68,7 +68,7 @@ fant.out: fant.o mallocNd.o $(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new mv fant.new fant.out - + # rlebox and crop use some common code. rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h @@ -82,7 +82,7 @@ # rleClock has it's own directory, must be built special rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c - (cd clock ; make) + (cd clock ; $(MAKE)) # Incremental install, copies everything ("$?") since last install to DEST dir. install: $(PGMS) install-pgm