entered into RCS

2 files changed, 20 insertions, 7 deletions

diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index 9663a5b4743..6d247d34806 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -32,6 +32,9 @@ HP 9000 series 200 or 300 (-machine=hp9000s300)
   If you're running BSD, specify `-opsystem=bsd4-3'.
 NOTE-END */
 
+/* I don't understand why we have to do this at all!  -JimB */
+#if 0
+
 /* Do this here at the top of the file; including sys/wait.h may
    include <endian.h>, which defines BIG_ENDIAN, which will conflict
    with our definition of BIG_ENDIAN if we do this at the bottom.  */
@@ -43,6 +46,8 @@ NOTE-END */
 #define WRETCODE(w) (((w) >> 8) & 0377)
 #endif
 
+#endif
+
 /* Define NOMULTIPLEJOBS on versions of HPUX before 6.5.  */
 
 /* #define NOMULTIPLEJOBS */
@@ -63,9 +68,10 @@ NOTE-END */
 
 /* Define BIG_ENDIAN iff lowest-numbered byte in a word
    is the most significant byte.  */
-/* Under BSD, <endian.h> defines this.  */
+/* Under BSD, <endian.h> defines this to be 4321; rather than fight with it,
+   we'll just give in.  Compatibility, akido style.  */
 #ifndef BIG_ENDIAN
-#define BIG_ENDIAN
+#define BIG_ENDIAN 4321
 #endif
 
 /* Define NO_ARG_ARRAY if you cannot take the address of the first of a
diff --git a/src/systime.h b/src/systime.h
index 787c51d89ab..1741c8cc046 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -17,6 +17,14 @@ 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 (HAVE_TIMEVAL) && !defined (NEED_TIME_H)
+/* NEED_TIME_H is necessary because some versions of HP/UX shouldn't
+   have this included; time.h should do the trick instead.  */
+
+#include <sys/time.h>
+
+#else
+
 /* _h_BSDTYPES is checked because on ISC unix, socket.h includes
    both time.h and sys/time.h, and the later file is protected
    from repeated inclusion.  We just hope that other systems will
@@ -25,12 +33,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <time.h>
 #endif /* _h_BSDTYPES */
 
-#ifdef HAVE_TIMEVAL
-#ifndef NEED_TIME_H             /* Some versions of HP/UX shouldn't have
-                                   this included; time.h should do the trick
-                                   instead.  */
-#include <sys/time.h>
+/* AIX needs both <sys/time.h> and <time.h>.  */
+#ifdef _AIX
+#include <time.h>
 #endif
+
 #endif