summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2013-08-04 19:43:59 (GMT)
committerRaymond Hettinger <python@rcn.com>2013-08-04 19:43:59 (GMT)
commit28dc9b9fc01f46401f1e085f9993ca4b429b154e (patch)
tree9d46b111f72a9591e43ef42e2d929707baea0911
parentec53111f76ecba0dacb1a66acca465481303a524 (diff)
parentd7bd7a5525ca0cdc5c65baaf377c4b2e55bf5601 (diff)
downloadcpython-28dc9b9fc01f46401f1e085f9993ca4b429b154e.zip
cpython-28dc9b9fc01f46401f1e085f9993ca4b429b154e.tar.gz
cpython-28dc9b9fc01f46401f1e085f9993ca4b429b154e.tar.bz2
merge
-rw-r--r--Modules/_ctypes/libffi_osx/x86/x86-ffi64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ctypes/libffi_osx/x86/x86-ffi64.c b/Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
index 9839833..f2610c1 100644
--- a/Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
+++ b/Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
@@ -46,7 +46,7 @@ ffi_call_unix64(
unsigned long bytes,
unsigned flags,
void* raddr,
- void (*fnaddr)(),
+ void (*fnaddr)(void),
unsigned ssecount);
/* All reference to register classes here is identical to the code in
@@ -431,7 +431,7 @@ ffi_prep_cif_machdep(
void
ffi_call(
ffi_cif* cif,
- void (*fn)(),
+ void (*fn)(void),
void* rvalue,
void** avalue)
{