Path: utzoo!utgpu!jarvis.csri.toronto.edu!mailrus!tut.cis.ohio-state.edu!SPICA.UCSC.EDU!timothy
From: timothy@SPICA.UCSC.EDU (Timothy Oborne)
Newsgroups: gnu.utils.bug
Subject: Gnu Make compile problem with sun cc
Message-ID: <8907212320.AA04043@spica.ucsc.edu>
Date: 21 Jul 89 23:20:53 GMT
Sender: daemon@tut.cis.ohio-state.edu
Distribution: gnu
Organization: GNUs Not Usenet
Lines: 46

Machine: Sun 3/280, Sun OS 3.5
CC: /bin/cc

The following is a context diff to get GNU make 3.54 to compile on a 
Sun 3/280, Sun OS 3.5 .  It is a trivial fix but it took me a while to
figure out exactly which file was the problem.

Simply, the file /usr/include/sys/param.h includes /usr/include/sys/types.h
so that you get a multiple define on the Sun. This patch could break something
if there was some reason <sys/param.h> was buried so far down in the file.  I
couldn't find any potential problems.

=========================================================================
Timothy W. Oborne, Systems Programmer	INTERNET: timothy@spica.ucsc.edu
University of California, Santa Cruz	UUCP: ucbvax!ucscc!saturn!timothy
=========================================================================

*** make.h	Sun Jun 11 19:08:16 1989
--- make_good.h	Fri Jul 21 16:09:23 1989
***************
*** 17,23 ****
--- 17,30 ----
  
  #include <signal.h>
  #include <stdio.h>
+ 
+ #ifdef sun
+ #include <sys/param.h>
+ #else /* sun */
  #include <sys/types.h>
+ #include <sys/param.h>
+ #endif /* sun */
+ 
  #include <sys/stat.h>
  
  #ifdef	USG
***************
*** 48,54 ****
  #endif	/* sparc.  */
  #endif	/* GCC.  */
  
- #include <sys/param.h>
  #ifndef MAXPATHLEN
  #define MAXPATHLEN 1024
  #endif	/* No MAXPATHLEN.  */
--- 55,60 ----