diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-19 02:18:19 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-19 02:18:19 +0100 |
| commit | 27dd471098e5d27949826295e821df972d9af083 (patch) | |
| tree | 05566c9cb594250aafd845512305ba0bcb9cce96 /unix/modffi.c | |
| parent | 3d19137442447f2e02db55bcd78b4c83cdc259f7 (diff) | |
| parent | 206dd2a905fc4bca89c0b1a8beb2c71516f2053f (diff) | |
| download | micropython-27dd471098e5d27949826295e821df972d9af083.tar.gz micropython-27dd471098e5d27949826295e821df972d9af083.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'unix/modffi.c')
| -rw-r--r-- | unix/modffi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unix/modffi.c b/unix/modffi.c index 7b8e43874b..bdaa3b2b43 100644 --- a/unix/modffi.c +++ b/unix/modffi.c @@ -63,7 +63,8 @@ STATIC ffi_type *char2ffi_type(char c) case 'L': return &ffi_type_ulong; case 'f': return &ffi_type_float; case 'd': return &ffi_type_double; - case 'p': + case 'p': // Deprecated - conflicts with struct module + case 'P': case 's': return &ffi_type_pointer; case 'v': return &ffi_type_void; default: return NULL; |