From 64759f87bccf92a1542913f02aca893bd8a4c413 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Mon, 4 Nov 2013 22:05:51 +0100
Subject: [PATCH] Bug 932991: Partly revert bug 898274 on jscpucfg.h, breaks
 OpenBSD/sparc64 (at least) where <machine/endian.h> must be included after
 <sys/types.h>. r=njn

---
 config/check_spidermonkey_style.py        | 1 +
 js/src/config/check_spidermonkey_style.py | 1 +
 js/src/jscpucfg.h                         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py
index 957b40f601e..f4ad12fece7 100644
--- a/config/check_spidermonkey_style.py
+++ b/config/check_spidermonkey_style.py
@@ -95,6 +95,7 @@ oddly_ordered_inclnames = set([
     'ctypes/typedefs.h',        # Included multiple times in the body of ctypes/CTypes.h
     'jsautokw.h',               # Included in the body of frontend/TokenStream.h
     'jswin.h',                  # Must be #included before <psapi.h>
+    'machine/endian.h',         # Must be included after <sys/types.h> on BSD
     'winbase.h',                # Must precede other system headers(?)
     'windef.h'                  # Must precede other system headers(?)
 ])
diff --git a/js/src/config/check_spidermonkey_style.py b/js/src/config/check_spidermonkey_style.py
index 957b40f601e..f4ad12fece7 100644
--- a/js/src/config/check_spidermonkey_style.py
+++ b/js/src/config/check_spidermonkey_style.py
@@ -95,6 +95,7 @@ oddly_ordered_inclnames = set([
     'ctypes/typedefs.h',        # Included multiple times in the body of ctypes/CTypes.h
     'jsautokw.h',               # Included in the body of frontend/TokenStream.h
     'jswin.h',                  # Must be #included before <psapi.h>
+    'machine/endian.h',         # Must be included after <sys/types.h> on BSD
     'winbase.h',                # Must precede other system headers(?)
     'windef.h'                  # Must precede other system headers(?)
 ])
diff --git a/js/src/jscpucfg.h b/js/src/jscpucfg.h
index ccacab3482f..e545d8329d8 100644
--- a/js/src/jscpucfg.h
+++ b/js/src/jscpucfg.h
@@ -53,8 +53,8 @@
 
 /* BSDs */
 #elif defined(JS_HAVE_MACHINE_ENDIAN_H)
-# include <machine/endian.h>
 # include <sys/types.h>
+# include <machine/endian.h>
 
 # if defined(_BYTE_ORDER)
 #  if _BYTE_ORDER == _LITTLE_ENDIAN