diff options
| author |  Martin Szulecki | 2013-02-27 15:07:05 +0100 |
|---|---|---|
| committer | Martin Szulecki | 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) if HAVE_CYTHON BUILT_SOURCES = imobiledevice.c -PXDINCLUDES = imobiledevice.pxd stdint.pxi $(CYTHON_PLIST_INCLUDE_DIR)/plist.pxd +PXDINCLUDES = imobiledevice.pxd $(CYTHON_PLIST_INCLUDE_DIR)/plist.pxd PXIINCLUDES = \ - stdint.pxi \ lockdown.pxi \ mobilesync.pxi \ 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 @@ cimport plist -include "stdint.pxi" +from libc.stdint cimport * cdef extern from "pyerrors.h": 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 @@ -cdef extern from *: - ctypedef unsigned char uint8_t - ctypedef short int int16_t - ctypedef unsigned short int uint16_t - ctypedef unsigned int uint32_t - ctypedef int int32_t - ctypedef long int time_t -IF UNAME_MACHINE == 'x86_64': - ctypedef long int int64_t - ctypedef unsigned long int uint64_t -ELSE: - ctypedef long long int int64_t - ctypedef unsigned long long int uint64_t - -cdef extern from "time.h": - cdef struct timeval: - time_t tv_sec - time_t tv_usec |