From 82bf2c1ac7e4398e57a102119fdf16beb02a6e24 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 11 Jan 2008 02:57:38 +0000 Subject: [PATCH] * defines.h (WORDS_BIGENDIAN): honor __BIG_ENDIAN__ than the result of configure. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- include/ruby/defines.h | 17 ++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54a885f9f3..91d1e011bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Fri Jan 11 10:24:03 2008 Nobuyoshi Nakada +Fri Jan 11 11:57:36 2008 Nobuyoshi Nakada + + * defines.h (WORDS_BIGENDIAN): honor __BIG_ENDIAN__ than the result of + configure. * lib/rdoc/options.rb (check_diagram): more precise check, darwin is not Windows but minwg is on it. diff --git a/include/ruby/defines.h b/include/ruby/defines.h index c0f2bc7425..00708e1039 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -110,6 +110,16 @@ void xfree(void*); #endif #endif +#if defined(__NeXT__) || defined(__APPLE__) +/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may + result in a different endian. Instead trust __BIG_ENDIAN__ and + __LITTLE_ENDIAN__ which are set correctly by -arch. */ +#undef WORDS_BIGENDIAN +#ifdef __BIG_ENDIAN__ +#define WORDS_BIGENDIAN +#endif +#endif + #ifdef __NeXT__ /* NextStep, OpenStep, Rhapsody */ #ifndef S_IRUSR @@ -163,13 +173,6 @@ void xfree(void*); #ifndef S_ISREG #define S_ISREG(mode) (((mode) & (0170000)) == (0100000)) #endif -/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may - result in a different endian. Instead trust __BIG_ENDIAN__ and - __LITTLE_ENDIAN__ which are set correctly by -arch. */ -#undef WORDS_BIGENDIAN -#ifdef __BIG_ENDIAN__ -#define WORDS_BIGENDIAN -#endif #ifndef __APPLE__ /* NextStep, OpenStep (but not Rhapsody) */ #ifndef GETPGRP_VOID