diff options
| author | 2013-02-27 15:07:05 +0100 | |
|---|---|---|
| committer | 2013-02-27 15:07:05 +0100 | |
| commit | 86cc3f0d16643a04e40c14de3f8b7aab2222b3fc (patch) | |
| tree | 5fb1456fb1aa85a73bb8ed492c92a450d7cd36bc | |
| parent | 7adb1424926e4e4777092fed2dbc9c3b8d68e983 (diff) | |
| download | libimobiledevice-86cc3f0d16643a04e40c14de3f8b7aab2222b3fc.tar.gz libimobiledevice-86cc3f0d16643a04e40c14de3f8b7aab2222b3fc.tar.bz2 | |
cython: Remove custom stdint.pxi and use libc.stdint cimport instead
| -rw-r--r-- | cython/Makefile.am | 3 | ||||
| -rw-r--r-- | cython/imobiledevice.pxd | 2 | ||||
| -rw-r--r-- | cython/stdint.pxi | 18 |
3 files changed, 2 insertions, 21 deletions
diff --git a/cython/Makefile.am b/cython/Makefile.am index ae10b06..64c5c1c 100644 --- a/cython/Makefile.am +++ b/cython/Makefile.am | |||
| @@ -6,9 +6,8 @@ AM_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(openssl_LIBS) $(libplist_LIBS) | |||
| 6 | if HAVE_CYTHON | 6 | if HAVE_CYTHON |
| 7 | 7 | ||
| 8 | BUILT_SOURCES = imobiledevice.c | 8 | BUILT_SOURCES = imobiledevice.c |
| 9 | PXDINCLUDES = imobiledevice.pxd stdint.pxi $(CYTHON_PLIST_INCLUDE_DIR)/plist.pxd | 9 | PXDINCLUDES = imobiledevice.pxd $(CYTHON_PLIST_INCLUDE_DIR)/plist.pxd |
| 10 | PXIINCLUDES = \ | 10 | PXIINCLUDES = \ |
| 11 | stdint.pxi \ | ||
| 12 | lockdown.pxi \ | 11 | lockdown.pxi \ |
| 13 | mobilesync.pxi \ | 12 | mobilesync.pxi \ |
| 14 | notification_proxy.pxi \ | 13 | notification_proxy.pxi \ |
diff --git a/cython/imobiledevice.pxd b/cython/imobiledevice.pxd index 3ec8dfb..cd17061 100644 --- a/cython/imobiledevice.pxd +++ b/cython/imobiledevice.pxd | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | cimport plist | 1 | cimport plist |
| 2 | 2 | ||
| 3 | include "stdint.pxi" | 3 | from libc.stdint cimport * |
| 4 | 4 | ||
| 5 | cdef extern from "pyerrors.h": | 5 | cdef extern from "pyerrors.h": |
| 6 | ctypedef class __builtin__.Exception [object PyBaseExceptionObject]: | 6 | ctypedef class __builtin__.Exception [object PyBaseExceptionObject]: |
diff --git a/cython/stdint.pxi b/cython/stdint.pxi deleted file mode 100644 index f9e5e95..0000000 --- a/cython/stdint.pxi +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | cdef extern from *: | ||
| 2 | ctypedef unsigned char uint8_t | ||
| 3 | ctypedef short int int16_t | ||
| 4 | ctypedef unsigned short int uint16_t | ||
| 5 | ctypedef unsigned int uint32_t | ||
| 6 | ctypedef int int32_t | ||
| 7 | ctypedef long int time_t | ||
| 8 | IF UNAME_MACHINE == 'x86_64': | ||
| 9 | ctypedef long int int64_t | ||
| 10 | ctypedef unsigned long int uint64_t | ||
| 11 | ELSE: | ||
| 12 | ctypedef long long int int64_t | ||
| 13 | ctypedef unsigned long long int uint64_t | ||
| 14 | |||
| 15 | cdef extern from "time.h": | ||
| 16 | cdef struct timeval: | ||
| 17 | time_t tv_sec | ||
| 18 | time_t tv_usec | ||
