From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 29 Jul 2004 17:34:20 +0000 (+0000)
Subject: (UNALIGNED_P): Use sizeof, not alignof.
X-Git-Tag: v5.3.0~1024
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f03b0c306018102ebc9a0e9f0dad012b7416bd92;p=thirdparty%2Fcoreutils.git

(UNALIGNED_P): Use sizeof, not alignof.
---

diff --git a/lib/memrchr.c b/lib/memrchr.c
index d3618cb298..5832ef82af 100644
--- a/lib/memrchr.c
+++ b/lib/memrchr.c
@@ -1,6 +1,6 @@
 /* memrchr -- find the last occurrence of a byte in a memory block
 
-   Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003 Free
+   Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004 Free
    Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
@@ -46,9 +46,11 @@
 # include <stdint.h>
 #endif
 
-#define alignof(type) offsetof (struct { char c; type x; }, x)
+/* Use sizeof, not alignof, for better performance on some hosts.  For
+   example, on m68k-linux alignof (type) will always be at most 2, but
+   you get better performance with a 4-byte aligned pointer.  */
 #ifdef UINTPTR_MAX
-# define UNALIGNED_P(p) (((uintptr_t) p) % alignof (unsigned long int) != 0)
+# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (unsigned long int) != 0)
 #else
 # define UNALIGNED_P(p) 1
 #endif