Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/Python26-08-ctypes.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 14736 641f63d0e468
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14736
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     1
 
--- Python-2.6/Modules/_ctypes/libffi/src/x86/ffitarget.h.orig	2008-03-05 09:09:11.000000000 +1300
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     2
 
+++ Python-2.6/Modules/_ctypes/libffi/src/x86/ffitarget.h	2008-12-02 21:13:10.108375117 +1300
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     3
 
@@ -54,10 +54,10 @@
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     4
 
 #endif
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     5
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     6
 
   /* ---- Intel x86 and AMD x86-64 - */
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     7
 
-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     8
 
+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__))
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     9
 
   FFI_SYSV,
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    10
 
   FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    11
 
-#ifdef __i386__
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    12
 
+#if defined (__i386__) || defined (__i386)
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    13
 
   FFI_DEFAULT_ABI = FFI_SYSV,
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    14
 
 #else
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    15
 
   FFI_DEFAULT_ABI = FFI_UNIX64,
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    16
 
--- Python-2.5.2/Modules/_ctypes/callproc.c.alloca	2008-06-05 23:48:27.578970813 +1200
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    17
 
+++ Python-2.5.2/Modules/_ctypes/callproc.c	2008-06-05 23:48:41.677662640 +1200
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    18
 
@@ -73,6 +73,8 @@
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    19
 
 #include <malloc.h>
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    20
 
 #endif
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    21
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    22
 
+#include <alloca.h>
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    23
 
+
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    24
 
 #include <ffi.h>
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    25
 
 #include "ctypes.h"
641f63d0e468 2008-12-09 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    26
upstream/oracle/spec-files