Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
4562c6b5
Commit
4562c6b5
authored
Sep 23, 2014
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
extract sys_time.pxd from time.pxd to fix naming collision of "struct timezone" and "long timezone"
parent
ee860710
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
20 deletions
+30
-20
CHANGES.rst
CHANGES.rst
+4
-0
Cython/Includes/posix/sys_time.pxd
Cython/Includes/posix/sys_time.pxd
+25
-0
Cython/Includes/posix/time.pxd
Cython/Includes/posix/time.pxd
+1
-20
No files found.
CHANGES.rst
View file @
4562c6b5
...
...
@@ -14,6 +14,10 @@ Features added
Bugs fixed
----------
* ``getitimer()``, ``setitimer()``, ``gettimeofday()`` and related type/constant
definitions were moved from ``posix/time.pxd`` to ``posix/sys_time.pxd`` to
fix a naming collision.
* Rerunning unmodified modules in IPython's cython support failed.
Patch by Matthias Bussonier.
...
...
Cython/Includes/posix/sys_time.pxd
0 → 100644
View file @
4562c6b5
# http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/time.h.html
from
posix.types
cimport
suseconds_t
,
time_t
cdef
extern
from
"sys/time.h"
nogil
:
enum
:
ITIMER_REAL
enum
:
ITIMER_VIRTUAL
enum
:
ITIMER_PROF
cdef
struct
timezone
:
int
tz_minuteswest
int
dsttime
cdef
struct
timeval
:
time_t
tv_sec
suseconds_t
tv_usec
cdef
struct
itimerval
:
timeval
it_interval
timeval
it_value
int
getitimer
(
int
,
itimerval
*
)
int
gettimeofday
(
timeval
*
tp
,
timezone
*
tzp
)
int
setitimer
(
int
,
const
itimerval
*
,
itimerval
*
)
Cython/Includes/posix/time.pxd
View file @
4562c6b5
...
...
@@ -3,7 +3,7 @@
from
posix.signal
cimport
sigevent
from
posix.types
cimport
clock_t
,
clockid_t
,
suseconds_t
,
time_t
,
timer_t
cdef
extern
from
"
sys/
time.h"
nogil
:
cdef
extern
from
"time.h"
nogil
:
enum
:
CLOCKS_PER_SEC
enum
:
CLOCK_PROCESS_CPUTIME_ID
...
...
@@ -33,22 +33,6 @@ cdef extern from "sys/time.h" nogil:
enum
:
CLOCK_REALTIME_ALARM
enum
:
CLOCK_BOOTTIME_ALARM
enum
:
ITIMER_REAL
enum
:
ITIMER_VIRTUAL
enum
:
ITIMER_PROF
cdef
struct
timeval
:
time_t
tv_sec
suseconds_t
tv_usec
cdef
struct
itimerval
:
timeval
it_interval
timeval
it_value
cdef
struct
timezone
:
int
tz_minuteswest
int
dsttime
cdef
struct
timespec
:
time_t
tv_sec
long
tv_nsec
...
...
@@ -82,15 +66,12 @@ cdef extern from "sys/time.h" nogil:
char
*
ctime_r
(
const
time_t
*
,
char
*
)
double
difftime
(
time_t
,
time_t
)
tm
*
getdate
(
const
char
*
)
int
getitimer
(
int
,
itimerval
*
)
int
gettimeofday
(
timeval
*
tp
,
timezone
*
tzp
)
tm
*
gmtime
(
const
time_t
*
)
tm
*
gmtime_r
(
const
time_t
*
,
tm
*
)
tm
*
localtime
(
const
time_t
*
)
tm
*
localtime_r
(
const
time_t
*
,
tm
*
)
time_t
mktime
(
tm
*
)
int
nanosleep
(
const
timespec
*
,
timespec
*
)
int
setitimer
(
int
,
const
itimerval
*
,
itimerval
*
)
size_t
strftime
(
char
*
,
size_t
,
const
char
*
,
const
tm
*
)
char
*
strptime
(
const
char
*
,
const
char
*
,
tm
*
)
time_t
time
(
time_t
*
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment