[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-361-g31dae6e

[Lawrence S. <ljs...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  31dae6ebfb38e3f1962fc6c7cfd2bf98c9f5fbd9 (commit)
      from  2b7068ff7221300a23d147d05893bcf4623be03a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31dae6ebfb38e3f1962fc6c7cfd2bf98c9f5fbd9
Author: Lawrence Sebald <ljs...@us...>
Date:   Tue Feb 11 09:16:13 2020 -0500

    Fix redefinition of BYTE_ORDER between <arch/types.h> and <arch/byteorder.h>.

-----------------------------------------------------------------------

Summary of changes:
 kernel/arch/dreamcast/include/arch/byteorder.h | 5 +++++
 kernel/arch/dreamcast/include/arch/types.h     | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/kernel/arch/dreamcast/include/arch/byteorder.h b/kernel/arch/dreamcast/include/arch/byteorder.h
index 9b5ffea..fbbb204 100644
--- a/kernel/arch/dreamcast/include/arch/byteorder.h
+++ b/kernel/arch/dreamcast/include/arch/byteorder.h
@@ -26,6 +26,11 @@ __BEGIN_DECLS
 
 #include <sys/_types.h>
 
+#ifdef BYTE_ORDER
+/* If we've included <arch/types.h>, this might already be defined... */
+#undef BYTE_ORDER
+#endif
+
 /** \brief  Define the byte-order of the platform in use. */
 #define BYTE_ORDER      LITTLE_ENDIAN
 
diff --git a/kernel/arch/dreamcast/include/arch/types.h b/kernel/arch/dreamcast/include/arch/types.h
index 83261da..6a47a79 100644
--- a/kernel/arch/dreamcast/include/arch/types.h
+++ b/kernel/arch/dreamcast/include/arch/types.h
@@ -80,6 +80,7 @@ typedef int handle_t;               /**< \brief Generic "handle" type */
 typedef handle_t tid_t;             /**< \brief Thread ID type */
 typedef handle_t prio_t;            /**< \brief Priority value type */
 
+#ifndef BYTE_ORDER
 /* Make sure to pull in the base endianness defines... */
 #ifndef LITTLE_ENDIAN
 #include <sys/_types.h>
@@ -87,8 +88,8 @@ typedef handle_t prio_t;            /**< \brief Priority value type */
 
 /** \brief  Endianness definition -- Little Endian */
 #define BYTE_ORDER  LITTLE_ENDIAN
+#endif
 
 __END_DECLS
 
 #endif  /* __ARCH_TYPES_H */
-


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.