*** src-working/bin/dig/dig.c	Fri Jul 25 11:58:01 1997
--- src/bin/dig/dig.c	Thu Apr 24 20:01:05 1997
***************
*** 215,226 ****
  int		curHostValid = FALSE;
  int		queryType, queryClass;
  extern int	StringToClass(), StringToType();	/* subr.c */
- /*
  #if defined(BSD) && BSD >= 199006 && !defined(RISCOS_BSD)
  FILE		*yyin = NULL;
  void		yyrestart(f) { }
  #endif
- */
  char		*pager = NULL;
  /* end of nslookup stuff */
  
--- 215,224 ----
diff -r -c src-working/bin/named/ns_defs.h src/bin/named/ns_defs.h
*** src-working/bin/named/ns_defs.h	Fri Jul 25 12:02:32 1997
--- src/bin/named/ns_defs.h	Mon Jun  9 13:46:54 1997
***************
*** 184,194 ****
  	/* Like assert() but using log system rather than stderr. */
  #define INSIST(c) if (!(c)) \
  	ns_panic(ns_log_insist, 1, "%s:%d: insist '%s' failed", \
! 		 __FILE__, __LINE__, c); else (void)NULL
  
  #define INSIST_ERR(c) if (!(c)) \
  	ns_panic(ns_log_insist, 1, "%s:%d: insist '%s' failed: %s", \
! 		 __FILE__, __LINE__, c, strerror(errno)); else (void)NULL
  
  enum severity { ignore, warn, fail, not_set };
  
--- 184,194 ----
  	/* Like assert() but using log system rather than stderr. */
  #define INSIST(c) if (!(c)) \
  	ns_panic(ns_log_insist, 1, "%s:%d: insist '%s' failed", \
! 		 __FILE__, __LINE__, #c); else (void)NULL
  
  #define INSIST_ERR(c) if (!(c)) \
  	ns_panic(ns_log_insist, 1, "%s:%d: insist '%s' failed: %s", \
! 		 __FILE__, __LINE__, #c, strerror(errno)); else (void)NULL
  
  enum severity { ignore, warn, fail, not_set };
  
*** src-working/bin/nslookup/send.c	Fri Jul 25 11:53:02 1997
--- src/bin/nslookup/send.c	Wed May 21 15:49:58 1997
***************
*** 284,290 ****
  					continue;
  				}
  			}
- /*
  #if BSD >= 43
  			if (connected == 0) {
  				if (connect(s, (struct sockaddr *)&sin,
--- 284,289 ----
***************
*** 300,307 ****
  					perror("send");
  				continue;
  			}
! 
! #else */ /* BSD */
  			if (sendto(s, (const char *)buf, buflen, 0,
  				   (struct sockaddr *) &sin,
  				   sizeof sin) != buflen) {
--- 299,305 ----
  					perror("send");
  				continue;
  			}
! #else /* BSD */
  			if (sendto(s, (const char *)buf, buflen, 0,
  				   (struct sockaddr *) &sin,
  				   sizeof sin) != buflen) {
***************
*** 309,317 ****
  					perror("sendto");
  				continue;
  			}
- /*
  #endif
! */
  			/*
  			 * Wait for reply
  			 */
--- 307,314 ----
  					perror("sendto");
  				continue;
  			}
  #endif
! 
  			/*
  			 * Wait for reply
  			 */
***************
*** 335,345 ****
  				 */
  				if (_res.options & RES_DEBUG)
  					printf("timeout\n");
- /*
  #if BSD >= 43
  				gotsomewhere = 1;
  #endif
- */
  				continue;
  			}
  
--- 332,340 ----
*** src-working/bin/nslookup/subr.c	Fri Jul 25 11:56:04 1997
--- src/bin/nslookup/subr.c	Thu Apr 24 20:27:19 1997
***************
*** 122,136 ****
  IntrHandler()
  {
      extern jmp_buf env;
- 
- /*
  #if defined(BSD) && BSD >= 199006 && !defined(RISCOS_BSD) && !defined(__osf__)
!     extern FILE *yyin;	*/	/* scanner input file */
! /*
!     extern void yyrestart();	*//* routine to restart scanner after interrupt */
! /*
  #endif
! */
      SendRequest_close();
      ListHost_close();
      if (filePtr != NULL && filePtr != stdout) {
--- 122,132 ----
  IntrHandler()
  {
      extern jmp_buf env;
  #if defined(BSD) && BSD >= 199006 && !defined(RISCOS_BSD) && !defined(__osf__)
!     extern FILE *yyin;		/* scanner input file */
!     extern void yyrestart();	/* routine to restart scanner after interrupt */
  #endif
! 
      SendRequest_close();
      ListHost_close();
      if (filePtr != NULL && filePtr != stdout) {
***************
*** 138,148 ****
  	filePtr = NULL;
      }
      printf("\n");
- /*
  #if defined(BSD) && BSD >= 199006 && !defined(RISCOS_BSD) && !defined(__osf__)
      yyrestart(yyin);
  #endif
- */
      longjmp(env, 1);
  }
  
--- 134,142 ----
*** src-working/include/netdb.h	Fri Jul 25 11:35:18 1997
--- src/include/netdb.h	Tue Nov 19 03:39:29 1996
***************
*** 62,72 ****
  #define _NETDB_H_
  
  #include <sys/param.h>
- /*
  #if (!defined(BSD)) || (BSD < 199306)
  # include <sys/bitypes.h>
  #endif
- */
  #include <sys/cdefs.h>
  
  #ifndef _PATH_HEQUIV
--- 62,70 ----
*** src-working/include/resolv.h	Fri Jul 25 11:34:22 1997
--- src/include/resolv.h	Mon Nov 18 04:08:49 1996
***************
*** 57,69 ****
  #define	_RESOLV_H_
  
  #include <sys/param.h>
- /*
  #if (!defined(BSD)) || (BSD < 199306)
  # include <sys/bitypes.h>
  #else
  # include <sys/types.h>
  #endif
- */
  #include <sys/cdefs.h>
  #include <stdio.h>
  
--- 57,67 ----
*** src-working/lib/isc/logging_p.h	Fri Jul 25 13:20:45 1997
--- src/lib/isc/logging_p.h	Wed Jan 29 03:52:44 1997
***************
*** 18,24 ****
  #ifndef LOGGING_P_H
  #define LOGGING_P_H
  
! #define LOG_BUFFER_SIZE 20480000
  
  typedef struct log_channel_list {
  	log_channel channel;
--- 18,24 ----
  #ifndef LOGGING_P_H
  #define LOGGING_P_H
  
! #define LOG_BUFFER_SIZE 20480
  
  typedef struct log_channel_list {
  	log_channel channel;
*** src-working/port/solaris/Makefile.set	Fri Jul 25 13:27:42 1997
--- src/port/solaris/Makefile.set	Wed Jan 29 03:50:04 1997
***************
*** 1,5 ****
! 'CC=cc'
! 'CDEBUG=-g -DSPRINTF_CHAR=1 -DLINT=1 -Dlint=1 -DVSPRINTF_CHAR=1'
  'DESTBIN=/usr/bin'
  'DESTSBIN=/usr/sbin'
  'DESTEXEC=/usr/sbin'
--- 1,5 ----
! 'CC=gcc'
! 'CDEBUG=-g -O2'
  'DESTBIN=/usr/bin'
  'DESTSBIN=/usr/sbin'
  'DESTEXEC=/usr/sbin'
*** src-working/port/solaris/bin/mkdep	Fri Jul 25 13:29:35 1997
--- src/port/solaris/bin/mkdep	Tue Dec 17 16:49:22 1996
***************
*** 108,114 ****
  # egrep '^#include[ 	]*".*"' /dev/null $* |
  # sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' -e 's/\.c/.o/' |
  
! cc -xM $* |
  sed "
  	s; \./; ;g
  	$SED" |
--- 108,114 ----
  # egrep '^#include[ 	]*".*"' /dev/null $* |
  # sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' -e 's/\.c/.o/' |
  
! gcc -M $* |
  sed "
  	s; \./; ;g
  	$SED" |