Changes for OSF/1:

	* mem-limits.h [__osf__ && (__mips || mips)]: #include
	<sys/time.h> and <sys/resource.h>.
	(get_lim_data): OSF wants a definition like BSD4_2's.
	* s/osf1.h: #include "bsd4-3.h", not "s-bsd4-3.h".

2 files changed, 7 insertions, 2 deletions

diff --git a/src/mem-limits.h b/src/mem-limits.h
index bb03c6f32f9..31c71dc3e4e 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -17,6 +17,11 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#if defined(__osf__) && (defined(__mips) || defined(mips))
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
 #ifndef BSD4_2
 #ifndef USG
 #include <sys/vlimit.h>
@@ -95,7 +100,7 @@ get_lim_data ()
 }
 
 #else /* not USG */
-#ifndef BSD4_2
+#if !defined(BSD4_2) && !defined(__osf__)
 
 static void
 get_lim_data ()
diff --git a/src/s/osf1.h b/src/s/osf1.h
index 65e80861cc1..491b8978a6f 100644
--- a/src/s/osf1.h
+++ b/src/s/osf1.h
@@ -1,4 +1,4 @@
-#include "s-bsd4-3.h"
+#include "bsd4-3.h"
 
 /* Identify OSF1 for the m- files. */