Commit 8cc44981 authored by Jeremy Huddleston's avatar Jeremy Huddleston Committed by Akira TAGOH

fcarch: Check for architecture signature at compile time rather than configure time

https://bugs.freedesktop.org/show_bug.cgi?id=20208Signed-off-by: Jeremy Huddleston's avatarJeremy Huddleston <jeremyhu@apple.com>
parent e1ffb3dc
......@@ -22,8 +22,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#include "../src/fcarch.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#else
......@@ -34,6 +32,7 @@
#endif
#include <fontconfig/fontconfig.h>
#include "../src/fcarch.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
......
......@@ -31,12 +31,12 @@
#ifndef FC_ARCHITECTURE
#include "fcarch.h"
/* Make sure the cache structure is consistent with what we expect */
#include "fcint.h"
#include "fcarch.h"
FC_ASSERT_STATIC (1 == sizeof (char));
FC_ASSERT_STATIC (2 == sizeof (FcChar16));
FC_ASSERT_STATIC (4 == sizeof (int));
......
......@@ -46,9 +46,28 @@
* be64 1234 8 8
*/
#if defined(WORDS_BIGENDIAN) && WORDS_BIGENDIAN
#ifdef __APPLE__
# include <machine/endian.h>
# undef SIZEOF_VOID_P
# undef ALIGNOF_DOUBLE
# ifdef __LP64__
# define SIZEOF_VOID_P 8
# define ALIGNOF_DOUBLE 8
# else
# define SIZEOF_VOID_P 4
# define ALIGNOF_DOUBLE 4
# endif
#endif
#if defined(__DARWIN_BYTE_ORDER) && __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
# define FC_ARCH_ENDIAN "le"
#elif defined(__DARWIN_BYTE_ORDER) && __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
# define FC_ARCH_ENDIAN "be"
#elif defined(__DARWIN_BYTE_ORDER) && __DARWIN_BYTE_ORDER == __DARWIN_PDP_ENDIAN
# define FC_ARCH_ENDIAN "pe"
#elif defined(WORDS_BIGENDIAN) && WORDS_BIGENDIAN
# define FC_ARCH_ENDIAN "be"
#else /* !WORDS_BIGENDIAN */
#else
# define FC_ARCH_ENDIAN "le"
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment