patches/python-ctypes-01-ffitarget.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 1641 bee7722f9bdd
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1641
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     1
--- ctypes-1.0.2/source/libffi/src/x86/ffitarget.h-orig	2009-01-21 04:16:39.423661000 -0600
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     2
+++ ctypes-1.0.2/source/libffi/src/x86/ffitarget.h	2009-01-21 04:17:10.942637000 -0600
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     3
@@ -51,10 +51,10 @@ typedef enum ffi_abi {
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     4
 #endif
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     5
 
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     6
   /* ---- Intel x86 and AMD x86-64 - */
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     7
-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__)) 
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     8
+#if !defined(X86_WIN32) && (defined(__i386__) || defined (__i386) || defined(__x86_64__))
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     9
   FFI_SYSV,
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    10
   FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    11
-#ifdef __i386__
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    12
+#if defined (__i386__) || defined (__i386)
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    13
   FFI_DEFAULT_ABI = FFI_SYSV,
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    14
 #else
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    15
   FFI_DEFAULT_ABI = FFI_UNIX64,
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    16
--- ctypes-1.0.2/source/callproc.c.alloca	2008-06-05 23:48:27.578970813 +1200
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    17
+++ ctypes-1.0.2/source/callproc.c	2008-06-05 23:48:41.677662640 +1200
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    18
@@ -73,6 +73,8 @@
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    19
 #include <malloc.h>
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    20
 #endif
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    21
 
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    22
+#include <alloca.h>
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    23
+
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    24
 #include <ffi.h>
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    25
 #include "ctypes.h"
bee7722f9bdd 2009-01-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    26