maybe a bug in 3.0.13 for osx 32bit builds

[Trenton Henry]

I am compiling the ffi code for osx directly into my application (as =
opposed to linking it as a library). I'm trying to build exclusively for =
32bit, on 10.9.=20

For the osx builds using the sources for libffi-3.0.13:

ffi64.c starts with
#if !defined(__i386__) && defined(__x86_64__)
as expected

ffi.c starts with
#if !defined(__i386__) && defined(__x86_64__)

but shouldn't it be
#if defined(__i386__) && !defined(__x86_64__)

Also, darwin.S starts with
#if !defined(__i386__) && defined(__x86_64__)
...
#ifndef __x86_64__

Shouldn't it also be
#if defined(__i386__) && !defined(__x86_64__)

Anyhow I made these minor changes and I got it to build and work fine. =
I'm just not certain what I did is right. It seems to make sense, but =
probably I failed to set something up right.
Thanks!
-Trenton Henry