> Date: Tue, 5 Apr 94 15:30:20 EDT
 > From: augustss@au-bon-pain.lcs.mit.edu (Lennart Augustsson)
 > To: current-users@sun-lamp.cs.berkeley.edu
 > Subject: usr.sbin/config
 > 
 > There is a function called raise in the config program, and another
 > in /usr/include/sys/signal.h which have conflicting types.
 > 
 > 	-- Lennart
 > 
 > PS.  Sorry I forgot to save the original file so I can't
 > send a patch.

I noticed this also. Here is a patch that just changes raise()
to raisestr().

  - Arne H. Juul

diff -rc /supmirror/src/usr.sbin/config/config.h usr.sbin/config/config.h
*** /supmirror/src/usr.sbin/config/config.h	Sat Mar 12 12:10:40 1994
--- usr.sbin/config/config.h	Tue Apr  5 20:50:05 1994
***************
*** 178,184 ****
  char	*get_word();
  char	*get_quoted_word();
  char	*path();
! char	*raise();
  
  int	do_trace;
  
--- 178,184 ----
  char	*get_word();
  char	*get_quoted_word();
  char	*path();
! char	*raisestr();
  
  int	do_trace;
  
diff -rc /supmirror/src/usr.sbin/config/mkmakefile.c usr.sbin/config/mkmakefile.c
*** /supmirror/src/usr.sbin/config/mkmakefile.c	Fri Mar 11 12:03:58 1994
--- usr.sbin/config/mkmakefile.c	Tue Apr  5 20:50:34 1994
***************
*** 156,163 ****
  		perror(path("Makefile"));
  		exit(1);
  	}
! 	fprintf(ofp, "KERN_IDENT=%s\n", raise(ident));		/* 29 Jun 92*/
! 	fprintf(ofp, "IDENT=-D%s", raise(ident));
  	if (profiling)
  		fprintf(ofp, " -DGPROF");
  	if (cputype == 0) {
--- 156,163 ----
  		perror(path("Makefile"));
  		exit(1);
  	}
! 	fprintf(ofp, "KERN_IDENT=%s\n", raisestr(ident));		/* 29 Jun 92*/
! 	fprintf(ofp, "IDENT=-D%s", raisestr(ident));
  	if (profiling)
  		fprintf(ofp, " -DGPROF");
  	if (cputype == 0) {
***************
*** 245,251 ****
  		    machinearch);
  		read_file(fname,1,0);
  	}
! 	(void) sprintf(fname, "files.%s", raise(ident));
  	read_file(fname,0,1);
  	(void) strcpy(fname, "../../../conf/options");
  	read_file(fname,0,0);
--- 245,251 ----
  		    machinearch);
  		read_file(fname,1,0);
  	}
! 	(void) sprintf(fname, "files.%s", raisestr(ident));
  	read_file(fname,0,1);
  	(void) strcpy(fname, "../../../conf/options");
  	read_file(fname,0,0);
***************
*** 256,262 ****
  		    machinearch);
  		read_file(fname,0,0);
  	}
! 	(void) sprintf(fname, "options.%s", raise(ident));
  	read_file(fname,0,1);
  }
  
--- 256,262 ----
  		    machinearch);
  		read_file(fname,0,0);
  	}
! 	(void) sprintf(fname, "options.%s", raisestr(ident));
  	read_file(fname,0,1);
  }
  
***************
*** 486,492 ****
  }
  
  char *
! raise(str)
  	register char *str;
  {
  	register char *cp = str;
--- 486,492 ----
  }
  
  char *
! raisestr(str)
  	register char *str;
  {
  	register char *cp = str;
Only in usr.sbin/config: obj
diff -rc /supmirror/src/usr.sbin/config/specfile.c usr.sbin/config/specfile.c
*** /supmirror/src/usr.sbin/config/specfile.c	Wed Mar 30 14:12:05 1994
--- usr.sbin/config/specfile.c	Tue Apr  5 20:50:42 1994
***************
*** 512,518 ****
              dev.d_slave = 0;
              dev.d_flags++;
              for (op=opt; op; lop=op, op=op->op_next) {
!                 char *od = raise(ns(kf_name));
   
                  /*
                   *  Found an option which matches the current device
--- 512,518 ----
              dev.d_slave = 0;
              dev.d_flags++;
              for (op=opt; op; lop=op, op=op->op_next) {
!                 char *od = raisestr(ns(kf_name));
   
                  /*
                   *  Found an option which matches the current device

------------------------------------------------------------------------------