[Python-checkins] cpython (merge 3.3 -> default): fixed libffi on PPC without __NO_FPRS__

christian.heimes python-checkins at python.org
Wed Jun 19 02:44:28 CEST 2013


http://hg.python.org/cpython/rev/1638f28f3b2f
changeset:   84214:1638f28f3b2f
parent:      84211:ac94b96b1aa7
parent:      84213:fd327ac2e7bd
user:        Christian Heimes <christian at cheimes.de>
date:        Wed Jun 19 02:43:19 2013 +0200
summary:
  fixed libffi on PPC without __NO_FPRS__
ISO C90 forbids mixed declarations and code

files:
  Modules/_ctypes/libffi/src/powerpc/ffi.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Modules/_ctypes/libffi/src/powerpc/ffi.c b/Modules/_ctypes/libffi/src/powerpc/ffi.c
--- a/Modules/_ctypes/libffi/src/powerpc/ffi.c
+++ b/Modules/_ctypes/libffi/src/powerpc/ffi.c
@@ -146,12 +146,14 @@
   } p_argv;
   size_t struct_copy_size;
   unsigned gprvalue;
+#ifndef __NO_FPRS__
+  double double_tmp;
+#endif
 
   stacktop.c = (char *) stack + bytes;
   gpr_base.u = stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS;
   intarg_count = 0;
 #ifndef __NO_FPRS__
-  double double_tmp;
   fpr_base.d = gpr_base.d - NUM_FPR_ARG_REGISTERS;
   fparg_count = 0;
   copy_space.c = ((flags & FLAG_FP_ARGUMENTS) ? fpr_base.c : gpr_base.c);

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list