Path: utzoo!utgpu!jarvis.csri.toronto.edu!mailrus!tut.cis.ohio-state.edu!ucbvax!ucsd!sdcsvax!ucsdhub!hp-sdd!hplabs!otter!hplb!anorman!ange
From: ange@hplb.hpl.hp.com (Andy Norman)
Newsgroups: gnu.utils.bug
Subject: GNU diff 1.7 diffs for HP-UX
Message-ID: <ANGE.89Jul11100432@anorman.hpl.hp.com>
Date: 11 Jul 89 14:04:32 GMT
Sender: news@hplb.hpl.hp.com
Distribution: gnu
Organization: Hewlett-Packard Laboratories, Bristol, UK.
Lines: 58

The following diffs enable GNU diff 1.7 to work on the hp9000/300 and
hp9000/800 machines at HP-UX releases 6.2 and 3.1 respectively.

diff -c old.diff/diff.h diff/diff.h
*** old.diff/diff.h	Fri Feb 24 17:42:05 1989
--- diff/diff.h	Tue Jul 11 09:39:31 1989
***************
*** 25,37 ****
  
  #ifdef USG
  #include <time.h>
! #ifdef hp9000s800
  #include <ndir.h>
  #else
  #include <dirent.h>
  #endif
  #include <fcntl.h>
  #define direct dirent
  #else
  #include <sys/time.h>
  #include <sys/dir.h>
--- 25,39 ----
  
  #ifdef USG
  #include <time.h>
! #if defined(hp9000s800) || defined(hp9000s300)
  #include <ndir.h>
  #else
  #include <dirent.h>
  #endif
  #include <fcntl.h>
+ #if !defined(hp9000s800) && !defined(hp9000s300)
  #define direct dirent
+ #endif
  #else
  #include <sys/time.h>
  #include <sys/dir.h>
diff -c old.diff/diff3.c diff/diff3.c
*** old.diff/diff3.c	Sat Apr  8 20:56:10 1989
--- diff/diff3.c	Tue Jul 11 09:45:52 1989
***************
*** 25,30 ****
--- 25,35 ----
  #include <ctype.h>
  
  #ifdef USG
+ 
+ #if defined(hp9000s300) || defined(hp9000s800)
+ #include <fcntl.h>
+ #endif
+ 
  /* Define needed BSD functions in terms of sysV library.  */
  
  #define bcopy(s,d,n)	memcpy((d),(s),(n))
--
					-- ange --

					ange@hplb.hpl.hp.com