From 8eec9c941348db179c900c896797c78b22d33261 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 8 Jan 2011 12:25:03 +0000 Subject: * pack.c (swapf): compilation condition simplified. (swapd): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ pack.c | 36 +++++++++++++----------------------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a9732c8b3..ae4da821c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 8 21:24:17 2011 Tanaka Akira + + * pack.c (swapf): compilation condition simplified. + (swapd): ditto. + Sat Jan 8 20:51:25 2011 Tanaka Akira * pack.c (swapd): remove duplicated code. diff --git a/pack.c b/pack.c index 74c12849c2..7031b45092 100644 --- a/pack.c +++ b/pack.c @@ -144,23 +144,17 @@ TOKEN_PASTE(swap,x)(xtype z) \ # endif #endif -#if SIZEOF_FLOAT == 4 -# ifdef HAVE_UINT32_T -# define swapf(x) swap32(x) -# define FLOAT_SWAPPER uint32_t -# else /* SIZEOF_FLOAT == 4 but undivide by known size of int */ - define_swapx(f,float) -# endif -#else /* SIZEOF_FLOAT != 4 */ - define_swapx(f,float) -#endif /* #if SIZEOF_FLOAT == 4 */ - -#if SIZEOF_DOUBLE == 8 -# ifdef HAVE_UINT64_T /* SIZEOF_DOUBLE == 8 == SIZEOF_UINT64_T */ -# define swapd(x) swap64(x) -# define DOUBLE_SWAPPER uint64_t -# else -# if HAVE_INT32_T /* SIZEOF_DOUBLE == 8 && 4 == SIZEOF_INT32 */ +#if SIZEOF_FLOAT == 4 && defined(HAVE_INT32_T) +# define swapf(x) swap32(x) +# define FLOAT_SWAPPER uint32_t +#else + define_swapx(f,float) +#endif + +#if SIZEOF_DOUBLE == 8 && defined(HAVE_INT64_T) +# define swapd(x) swap64(x) +# define DOUBLE_SWAPPER uint64_t +#elif SIZEOF_DOUBLE == 8 && defined(HAVE_INT32_T) static double swapd(const double d) { @@ -176,13 +170,9 @@ TOKEN_PASTE(swap,x)(xtype z) \ memcpy(&dtmp,utmp,sizeof(double)); return dtmp; } -# else /* SIZEOF_DOUBLE == 8 but undivide by known size of int */ +#else define_swapx(d, double) -# endif -# endif /* #if SIZEOF_LONG == 8 */ -#else /* SIZEOF_DOUBLE != 8 */ - define_swapx(d, double) -#endif /* #if SIZEOF_DOUBLE == 8 */ +#endif #undef define_swapx -- cgit v1.2.3