Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 2 of 2.

15 files changed, 268 insertions, 268 deletions

diff --git a/contrib/tools/cython/Cython/Includes/posix/dlfcn.pxd b/contrib/tools/cython/Cython/Includes/posix/dlfcn.pxd
index cc0b6ab93a..cff5bea15a 100644
--- a/contrib/tools/cython/Cython/Includes/posix/dlfcn.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/dlfcn.pxd
@@ -1,14 +1,14 @@
-# POSIX dynamic linking/loading interface. 
-# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/dlfcn.h.html 
- 
-cdef extern from "<dlfcn.h>" nogil: 
-    void *dlopen(const char *, int) 
-    char *dlerror() 
-    void *dlsym(void *, const char *) 
-    int dlclose(void *) 
- 
-    enum: 
-        RTLD_LAZY 
-        RTLD_NOW 
-        RTLD_GLOBAL 
-        RTLD_LOCAL 
+# POSIX dynamic linking/loading interface.
+# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/dlfcn.h.html
+
+cdef extern from "<dlfcn.h>" nogil:
+    void *dlopen(const char *, int)
+    char *dlerror()
+    void *dlsym(void *, const char *)
+    int dlclose(void *)
+
+    enum:
+        RTLD_LAZY
+        RTLD_NOW
+        RTLD_GLOBAL
+        RTLD_LOCAL
diff --git a/contrib/tools/cython/Cython/Includes/posix/fcntl.pxd b/contrib/tools/cython/Cython/Includes/posix/fcntl.pxd
index 889b2d9b96..9afc33a368 100644
--- a/contrib/tools/cython/Cython/Includes/posix/fcntl.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/fcntl.pxd
@@ -1,6 +1,6 @@
 # http://www.opengroup.org/onlinepubs/009695399/basedefs/fcntl.h.html
 
-cdef extern from "<fcntl.h>" nogil: 
+cdef extern from "<fcntl.h>" nogil:
 
     enum: F_DUPFD
     enum: F_GETFD
diff --git a/contrib/tools/cython/Cython/Includes/posix/ioctl.pxd b/contrib/tools/cython/Cython/Includes/posix/ioctl.pxd
index b9e8814b8f..dacbc307f3 100644
--- a/contrib/tools/cython/Cython/Includes/posix/ioctl.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/ioctl.pxd
@@ -1,4 +1,4 @@
-cdef extern from "<sys/ioctl.h>" nogil: 
+cdef extern from "<sys/ioctl.h>" nogil:
     enum: FIONBIO
 
     int ioctl(int fd, int request, ...)
diff --git a/contrib/tools/cython/Cython/Includes/posix/mman.pxd b/contrib/tools/cython/Cython/Includes/posix/mman.pxd
index 483547621a..c810f431b3 100644
--- a/contrib/tools/cython/Cython/Includes/posix/mman.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/mman.pxd
@@ -1,99 +1,99 @@
-# http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/mman.h.html 
- 
-from posix.types cimport off_t, mode_t 
- 
-cdef extern from "<sys/mman.h>" nogil: 
-    enum: PROT_EXEC                 # protection bits for mmap/mprotect 
-    enum: PROT_READ 
-    enum: PROT_WRITE 
-    enum: PROT_NONE 
- 
-    enum: MAP_PRIVATE               # flag bits for mmap 
-    enum: MAP_SHARED 
-    enum: MAP_FIXED 
-    enum: MAP_ANON                  # These three are not in POSIX, but are 
-    enum: MAP_ANONYMOUS             # fairly common in spelling/semantics 
-    enum: MAP_STACK 
- 
-    enum: MAP_LOCKED                # Typically available only on Linux 
-    enum: MAP_HUGETLB 
-    enum: MAP_POPULATE 
-    enum: MAP_NORESERVE 
-    enum: MAP_GROWSDOWN 
- 
-    enum: MAP_NOCORE                #  Typically available only on BSD 
-    enum: MAP_NOSYNC 
- 
-    void *MAP_FAILED 
- 
-    void *mmap(void *addr, size_t Len, int prot, int flags, int fd, off_t off) 
-    int   munmap(void *addr, size_t Len) 
-    int   mprotect(void *addr, size_t Len, int prot) 
- 
-    enum: MS_ASYNC 
-    enum: MS_SYNC 
-    enum: MS_INVALIDATE 
-    int   msync(void *addr, size_t Len, int flags) 
- 
-    enum: POSIX_MADV_NORMAL         # POSIX advice flags 
-    enum: POSIX_MADV_SEQUENTIAL 
-    enum: POSIX_MADV_RANDOM 
-    enum: POSIX_MADV_WILLNEED 
-    enum: POSIX_MADV_DONTNEED 
-    int   posix_madvise(void *addr, size_t Len, int advice) 
- 
-    enum: MCL_CURRENT 
-    enum: MCL_FUTURE 
-    int   mlock(const void *addr, size_t Len) 
-    int   munlock(const void *addr, size_t Len) 
-    int   mlockall(int flags) 
-    int   munlockall() 
-    # Linux-specific 
-    enum: MLOCK_ONFAULT 
-    enum: MCL_ONFAULT 
-    int   mlock2(const void *addr, size_t len, int flags) 
- 
-    int shm_open(const char *name, int oflag, mode_t mode) 
-    int shm_unlink(const char *name) 
- 
-    # often available 
-    enum: MADV_NORMAL               # pre-POSIX advice flags; should translate 1-1 to POSIX_* 
-    enum: MADV_RANDOM               # but in practice it is not always the same. 
-    enum: MADV_SEQUENTIAL 
-    enum: MADV_WILLNEED 
-    enum: MADV_DONTNEED 
-    enum: MADV_REMOVE               # other pre-POSIX advice flags; often available 
-    enum: MADV_DONTFORK 
-    enum: MADV_DOFORK 
-    enum: MADV_HWPOISON 
-    enum: MADV_MERGEABLE, 
-    enum: MADV_UNMERGEABLE 
-    enum: MADV_SOFT_OFFLINE 
-    enum: MADV_HUGEPAGE 
-    enum: MADV_NOHUGEPAGE 
-    enum: MADV_DONTDUMP 
-    enum: MADV_DODUMP 
-    enum: MADV_FREE 
-    enum: MADV_WIPEONFORK 
-    enum: MADV_KEEPONFORK 
-    int   madvise(void *addr, size_t Len, int advice) 
- 
-    # sometimes available 
-    int   mincore(void *addr, size_t Len, unsigned char *vec) 
- 
-    # These two are Linux specific but sometimes very efficient 
-    void *mremap(void *old_addr, size_t old_len, size_t new_len, int flags, ...) 
-    int   remap_file_pages(void *addr, size_t Len, int prot, 
-                           size_t pgoff, int flags) 
- 
-    # The rare but standardized typed memory option 
-    enum: POSIX_TYPED_MEM_ALLOCATE 
-    enum: POSIX_TYPED_MEM_ALLOCATE_CONTIG 
-    enum: POSIX_TYPED_MEM_MAP_ALLOCATABLE 
-    int posix_typed_mem_open(const char *name, int oflag, int tflag) 
-    int posix_mem_offset(const void *addr, size_t Len, off_t *off, 
-                         size_t *contig_len, int *fildes) 
- 
-    cdef struct posix_typed_mem_info: 
-        size_t posix_tmi_length 
-    int posix_typed_mem_get_info(int fildes, posix_typed_mem_info *info) 
+# http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/mman.h.html
+
+from posix.types cimport off_t, mode_t
+
+cdef extern from "<sys/mman.h>" nogil:
+    enum: PROT_EXEC                 # protection bits for mmap/mprotect
+    enum: PROT_READ
+    enum: PROT_WRITE
+    enum: PROT_NONE
+
+    enum: MAP_PRIVATE               # flag bits for mmap
+    enum: MAP_SHARED
+    enum: MAP_FIXED
+    enum: MAP_ANON                  # These three are not in POSIX, but are
+    enum: MAP_ANONYMOUS             # fairly common in spelling/semantics
+    enum: MAP_STACK
+
+    enum: MAP_LOCKED                # Typically available only on Linux
+    enum: MAP_HUGETLB
+    enum: MAP_POPULATE
+    enum: MAP_NORESERVE
+    enum: MAP_GROWSDOWN
+
+    enum: MAP_NOCORE                #  Typically available only on BSD
+    enum: MAP_NOSYNC
+
+    void *MAP_FAILED
+
+    void *mmap(void *addr, size_t Len, int prot, int flags, int fd, off_t off)
+    int   munmap(void *addr, size_t Len)
+    int   mprotect(void *addr, size_t Len, int prot)
+
+    enum: MS_ASYNC
+    enum: MS_SYNC
+    enum: MS_INVALIDATE
+    int   msync(void *addr, size_t Len, int flags)
+
+    enum: POSIX_MADV_NORMAL         # POSIX advice flags
+    enum: POSIX_MADV_SEQUENTIAL
+    enum: POSIX_MADV_RANDOM
+    enum: POSIX_MADV_WILLNEED
+    enum: POSIX_MADV_DONTNEED
+    int   posix_madvise(void *addr, size_t Len, int advice)
+
+    enum: MCL_CURRENT
+    enum: MCL_FUTURE
+    int   mlock(const void *addr, size_t Len)
+    int   munlock(const void *addr, size_t Len)
+    int   mlockall(int flags)
+    int   munlockall()
+    # Linux-specific
+    enum: MLOCK_ONFAULT
+    enum: MCL_ONFAULT
+    int   mlock2(const void *addr, size_t len, int flags)
+
+    int shm_open(const char *name, int oflag, mode_t mode)
+    int shm_unlink(const char *name)
+
+    # often available
+    enum: MADV_NORMAL               # pre-POSIX advice flags; should translate 1-1 to POSIX_*
+    enum: MADV_RANDOM               # but in practice it is not always the same.
+    enum: MADV_SEQUENTIAL
+    enum: MADV_WILLNEED
+    enum: MADV_DONTNEED
+    enum: MADV_REMOVE               # other pre-POSIX advice flags; often available
+    enum: MADV_DONTFORK
+    enum: MADV_DOFORK
+    enum: MADV_HWPOISON
+    enum: MADV_MERGEABLE,
+    enum: MADV_UNMERGEABLE
+    enum: MADV_SOFT_OFFLINE
+    enum: MADV_HUGEPAGE
+    enum: MADV_NOHUGEPAGE
+    enum: MADV_DONTDUMP
+    enum: MADV_DODUMP
+    enum: MADV_FREE
+    enum: MADV_WIPEONFORK
+    enum: MADV_KEEPONFORK
+    int   madvise(void *addr, size_t Len, int advice)
+
+    # sometimes available
+    int   mincore(void *addr, size_t Len, unsigned char *vec)
+
+    # These two are Linux specific but sometimes very efficient
+    void *mremap(void *old_addr, size_t old_len, size_t new_len, int flags, ...)
+    int   remap_file_pages(void *addr, size_t Len, int prot,
+                           size_t pgoff, int flags)
+
+    # The rare but standardized typed memory option
+    enum: POSIX_TYPED_MEM_ALLOCATE
+    enum: POSIX_TYPED_MEM_ALLOCATE_CONTIG
+    enum: POSIX_TYPED_MEM_MAP_ALLOCATABLE
+    int posix_typed_mem_open(const char *name, int oflag, int tflag)
+    int posix_mem_offset(const void *addr, size_t Len, off_t *off,
+                         size_t *contig_len, int *fildes)
+
+    cdef struct posix_typed_mem_info:
+        size_t posix_tmi_length
+    int posix_typed_mem_get_info(int fildes, posix_typed_mem_info *info)
diff --git a/contrib/tools/cython/Cython/Includes/posix/resource.pxd b/contrib/tools/cython/Cython/Includes/posix/resource.pxd
index 1227724323..9f55c6ab4e 100644
--- a/contrib/tools/cython/Cython/Includes/posix/resource.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/resource.pxd
@@ -1,9 +1,9 @@
 # http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/resource.h.html
 
-from posix.time  cimport timeval 
+from posix.time  cimport timeval
 from posix.types cimport id_t
 
-cdef extern from "<sys/resource.h>" nogil: 
+cdef extern from "<sys/resource.h>" nogil:
 
     enum: PRIO_PROCESS
     enum: PRIO_PGRP
diff --git a/contrib/tools/cython/Cython/Includes/posix/select.pxd b/contrib/tools/cython/Cython/Includes/posix/select.pxd
index af9509ea43..46703df104 100644
--- a/contrib/tools/cython/Cython/Includes/posix/select.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/select.pxd
@@ -1,19 +1,19 @@
-from .types cimport sigset_t 
-from .time cimport timeval, timespec 
- 
-cdef extern from "<sys/select.h>" nogil: 
-    ctypedef struct fd_set: 
-        pass 
- 
-    int FD_SETSIZE 
-    void FD_SET(int, fd_set*) 
-    void FD_CLR(int, fd_set*) 
-    bint FD_ISSET(int, fd_set*) 
-    void FD_ZERO(fd_set*) 
- 
-    int select(int nfds, fd_set *readfds, fd_set *writefds, 
-        fd_set *exceptfds, const timeval *timeout) 
- 
-    int pselect(int nfds, fd_set *readfds, fd_set *writefds, 
-        fd_set *exceptfds, const timespec *timeout, 
-        const sigset_t *sigmask) 
+from .types cimport sigset_t
+from .time cimport timeval, timespec
+
+cdef extern from "<sys/select.h>" nogil:
+    ctypedef struct fd_set:
+        pass
+
+    int FD_SETSIZE
+    void FD_SET(int, fd_set*)
+    void FD_CLR(int, fd_set*)
+    bint FD_ISSET(int, fd_set*)
+    void FD_ZERO(fd_set*)
+
+    int select(int nfds, fd_set *readfds, fd_set *writefds,
+        fd_set *exceptfds, const timeval *timeout)
+
+    int pselect(int nfds, fd_set *readfds, fd_set *writefds,
+        fd_set *exceptfds, const timespec *timeout,
+        const sigset_t *sigmask)
diff --git a/contrib/tools/cython/Cython/Includes/posix/signal.pxd b/contrib/tools/cython/Cython/Includes/posix/signal.pxd
index eafb164313..9fe7d9c36c 100644
--- a/contrib/tools/cython/Cython/Includes/posix/signal.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/signal.pxd
@@ -2,7 +2,7 @@
 
 from posix.types cimport pid_t, sigset_t, uid_t
 
-cdef extern from "<signal.h>" nogil: 
+cdef extern from "<signal.h>" nogil:
 
     cdef union sigval:
         int  sival_int
@@ -12,7 +12,7 @@ cdef extern from "<signal.h>" nogil:
         int    sigev_notify
         int    sigev_signo
         sigval sigev_value
-        void   sigev_notify_function(sigval) 
+        void   sigev_notify_function(sigval)
 
     ctypedef struct siginfo_t:
         int    si_signo
@@ -26,8 +26,8 @@ cdef extern from "<signal.h>" nogil:
         sigval si_value
 
     cdef struct sigaction_t "sigaction":
-        void     sa_handler(int) 
-        void     sa_sigaction(int, siginfo_t *, void *) 
+        void     sa_handler(int)
+        void     sa_sigaction(int, siginfo_t *, void *)
         sigset_t sa_mask
         int      sa_flags
 
@@ -68,6 +68,6 @@ cdef extern from "<signal.h>" nogil:
     int          sigdelset     (sigset_t *, int)
     int          sigemptyset   (sigset_t *)
     int          sigfillset    (sigset_t *)
-    int          sigismember   (const sigset_t *, int) 
+    int          sigismember   (const sigset_t *, int)
 
     int sigaltstack(const stack_t *, stack_t *)
diff --git a/contrib/tools/cython/Cython/Includes/posix/stat.pxd b/contrib/tools/cython/Cython/Includes/posix/stat.pxd
index 30f1791ba5..69c2eca166 100644
--- a/contrib/tools/cython/Cython/Includes/posix/stat.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/stat.pxd
@@ -2,7 +2,7 @@ from posix.types cimport (blkcnt_t, blksize_t, dev_t, gid_t, ino_t, mode_t,
                           nlink_t, off_t, time_t, uid_t)
 
 
-cdef extern from "<sys/stat.h>" nogil: 
+cdef extern from "<sys/stat.h>" nogil:
     cdef struct struct_stat "stat":
         dev_t   st_dev
         ino_t   st_ino
@@ -24,7 +24,7 @@ cdef extern from "<sys/stat.h>" nogil:
         time_t  st_birthtime
 
 # POSIX prescribes including both <sys/stat.h> and <unistd.h> for these
-cdef extern from "<unistd.h>" nogil: 
+cdef extern from "<unistd.h>" nogil:
     int fchmod(int, mode_t)
     int chmod(const char *, mode_t)
 
diff --git a/contrib/tools/cython/Cython/Includes/posix/stdio.pxd b/contrib/tools/cython/Cython/Includes/posix/stdio.pxd
index 327fbb3cb6..53913fdf45 100644
--- a/contrib/tools/cython/Cython/Includes/posix/stdio.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/stdio.pxd
@@ -1,37 +1,37 @@
-# POSIX additions to <stdio.h>. 
-# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stdio.h.html 
- 
-from libc.stdio cimport FILE 
-from libc.stddef cimport wchar_t 
-from posix.types cimport off_t 
- 
-cdef extern from "<stdio.h>" nogil: 
-    # File descriptors 
-    FILE *fdopen(int, const char *) 
-    int fileno(FILE *) 
- 
-    # Pipes 
-    FILE *popen(const char *, const char *) 
-    int pclose(FILE *) 
- 
-    # Memory streams (POSIX.2008) 
-    FILE *fmemopen(void *, size_t, const char *) 
-    FILE *open_memstream(char **, size_t *) 
-    FILE *open_wmemstream(wchar_t **, size_t *) 
- 
-    # Seek and tell with off_t 
-    int fseeko(FILE *, off_t, int) 
-    off_t ftello(FILE *) 
- 
-    # Locking (for multithreading) 
-    void flockfile(FILE *) 
-    int ftrylockfile(FILE *) 
-    void funlockfile(FILE *) 
-    int getc_unlocked(FILE *) 
-    int getchar_unlocked() 
-    int putc_unlocked(int, FILE *) 
-    int putchar_unlocked(int) 
- 
-    # Reading lines and records (POSIX.2008) 
-    ssize_t getline(char **, size_t *, FILE *) 
-    ssize_t getdelim(char **, size_t *, int, FILE *) 
+# POSIX additions to <stdio.h>.
+# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stdio.h.html
+
+from libc.stdio cimport FILE
+from libc.stddef cimport wchar_t
+from posix.types cimport off_t
+
+cdef extern from "<stdio.h>" nogil:
+    # File descriptors
+    FILE *fdopen(int, const char *)
+    int fileno(FILE *)
+
+    # Pipes
+    FILE *popen(const char *, const char *)
+    int pclose(FILE *)
+
+    # Memory streams (POSIX.2008)
+    FILE *fmemopen(void *, size_t, const char *)
+    FILE *open_memstream(char **, size_t *)
+    FILE *open_wmemstream(wchar_t **, size_t *)
+
+    # Seek and tell with off_t
+    int fseeko(FILE *, off_t, int)
+    off_t ftello(FILE *)
+
+    # Locking (for multithreading)
+    void flockfile(FILE *)
+    int ftrylockfile(FILE *)
+    void funlockfile(FILE *)
+    int getc_unlocked(FILE *)
+    int getchar_unlocked()
+    int putc_unlocked(int, FILE *)
+    int putchar_unlocked(int)
+
+    # Reading lines and records (POSIX.2008)
+    ssize_t getline(char **, size_t *, FILE *)
+    ssize_t getdelim(char **, size_t *, int, FILE *)
diff --git a/contrib/tools/cython/Cython/Includes/posix/stdlib.pxd b/contrib/tools/cython/Cython/Includes/posix/stdlib.pxd
index e276ddac92..513de938a8 100644
--- a/contrib/tools/cython/Cython/Includes/posix/stdlib.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/stdlib.pxd
@@ -1,7 +1,7 @@
 # POSIX additions to <stdlib.h>
 # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stdlib.h.html
 
-cdef extern from "<stdlib.h>" nogil: 
+cdef extern from "<stdlib.h>" nogil:
     void   _Exit(int)
     double drand48()
     double erand48(unsigned short *)
diff --git a/contrib/tools/cython/Cython/Includes/posix/strings.pxd b/contrib/tools/cython/Cython/Includes/posix/strings.pxd
index 40d33e11eb..6ee48491eb 100644
--- a/contrib/tools/cython/Cython/Includes/posix/strings.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/strings.pxd
@@ -1,9 +1,9 @@
-cdef extern from "<strings.h>" nogil: 
-    int    bcmp(const void *, const void *, size_t) 
-    void   bcopy(const void *, void *, size_t) 
-    void   bzero(void *, size_t) 
-    int    ffs(int) 
-    char   *index(const char *, int) 
-    char   *rindex(const char *, int) 
-    int    strcasecmp(const char *, const char *) 
-    int    strncasecmp(const char *, const char *, size_t) 
+cdef extern from "<strings.h>" nogil:
+    int    bcmp(const void *, const void *, size_t)
+    void   bcopy(const void *, void *, size_t)
+    void   bzero(void *, size_t)
+    int    ffs(int)
+    char   *index(const char *, int)
+    char   *rindex(const char *, int)
+    int    strcasecmp(const char *, const char *)
+    int    strncasecmp(const char *, const char *, size_t)
diff --git a/contrib/tools/cython/Cython/Includes/posix/time.pxd b/contrib/tools/cython/Cython/Includes/posix/time.pxd
index 0c67ddc3a4..6bc81bfea0 100644
--- a/contrib/tools/cython/Cython/Includes/posix/time.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/time.pxd
@@ -1,9 +1,9 @@
 # http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/time.h.html
 
-from posix.types cimport suseconds_t, time_t, clockid_t, timer_t 
+from posix.types cimport suseconds_t, time_t, clockid_t, timer_t
 from posix.signal cimport sigevent
 
-cdef extern from "<sys/time.h>" nogil: 
+cdef extern from "<sys/time.h>" nogil:
     enum: CLOCK_REALTIME
     enum: TIMER_ABSTIME
     enum: CLOCK_MONOTONIC
@@ -32,18 +32,18 @@ cdef extern from "<sys/time.h>" nogil:
     enum: ITIMER_VIRTUAL
     enum: ITIMER_PROF
 
-    cdef struct timezone: 
-        int tz_minuteswest 
-        int dsttime 
- 
+    cdef struct timezone:
+        int tz_minuteswest
+        int dsttime
+
     cdef struct timeval:
         time_t      tv_sec
         suseconds_t tv_usec
 
-    cdef struct timespec: 
-        time_t tv_sec 
-        long   tv_nsec 
- 
+    cdef struct timespec:
+        time_t tv_sec
+        long   tv_nsec
+
     cdef struct itimerval:
         timeval it_interval
         timeval it_value
@@ -52,20 +52,20 @@ cdef extern from "<sys/time.h>" nogil:
         timespec it_interval
         timespec it_value
 
-    int nanosleep(const timespec *, timespec *) 
+    int nanosleep(const timespec *, timespec *)
+
+    int getitimer(int, itimerval *)
+    int gettimeofday(timeval *tp, timezone *tzp)
+    int setitimer(int, const itimerval *, itimerval *)
 
-    int getitimer(int, itimerval *) 
-    int gettimeofday(timeval *tp, timezone *tzp) 
-    int setitimer(int, const itimerval *, itimerval *) 
+    int clock_getcpuclockid(pid_t, clockid_t *)
+    int clock_getres(clockid_t, timespec *)
+    int clock_gettime(clockid_t, timespec *)
+    int clock_nanosleep(clockid_t, int, const timespec *, timespec *)
+    int clock_settime(clockid_t, const timespec *)
 
-    int clock_getcpuclockid(pid_t, clockid_t *) 
-    int clock_getres(clockid_t, timespec *) 
-    int clock_gettime(clockid_t, timespec *) 
-    int clock_nanosleep(clockid_t, int, const timespec *, timespec *) 
-    int clock_settime(clockid_t, const timespec *) 
- 
-    int timer_create(clockid_t, sigevent *, timer_t *) 
-    int timer_delete(timer_t) 
-    int timer_gettime(timer_t, itimerspec *) 
-    int timer_getoverrun(timer_t) 
-    int timer_settime(timer_t, int, const itimerspec *, itimerspec *) 
+    int timer_create(clockid_t, sigevent *, timer_t *)
+    int timer_delete(timer_t)
+    int timer_gettime(timer_t, itimerspec *)
+    int timer_getoverrun(timer_t)
+    int timer_settime(timer_t, int, const itimerspec *, itimerspec *)
diff --git a/contrib/tools/cython/Cython/Includes/posix/types.pxd b/contrib/tools/cython/Cython/Includes/posix/types.pxd
index b74bba3a8f..308f2954ee 100644
--- a/contrib/tools/cython/Cython/Includes/posix/types.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/types.pxd
@@ -1,23 +1,23 @@
-# Note that the actual size of these types is system-dependent, and 
-# can't be detected at C compile time.  However, the generated C code 
-# will correctly use the actual size of these types *except* for 
-# determining promotion in binary arithmetic expressions involving 
-# mixed types.  In this case, operands are promoted to the declared 
-# larger type, with a bias towards typedef types.  Thus, with the 
-# declarations below, long + time_t will result in a time_t whereas 
-# long long + time_t will result in a long long which should be 
-# acceptable for either 32-bit or 64-bit signed time_t (though admittedly 
-# the POSIX standard doesn't even specify that time_t must be an integral 
-# type). 
- 
-cdef extern from "<sys/types.h>": 
+# Note that the actual size of these types is system-dependent, and
+# can't be detected at C compile time.  However, the generated C code
+# will correctly use the actual size of these types *except* for
+# determining promotion in binary arithmetic expressions involving
+# mixed types.  In this case, operands are promoted to the declared
+# larger type, with a bias towards typedef types.  Thus, with the
+# declarations below, long + time_t will result in a time_t whereas
+# long long + time_t will result in a long long which should be
+# acceptable for either 32-bit or 64-bit signed time_t (though admittedly
+# the POSIX standard doesn't even specify that time_t must be an integral
+# type).
+
+cdef extern from "<sys/types.h>":
     ctypedef long blkcnt_t
     ctypedef long blksize_t
     ctypedef long clockid_t
     ctypedef long dev_t
     ctypedef long gid_t
     ctypedef long id_t
-    ctypedef unsigned long ino_t 
+    ctypedef unsigned long ino_t
     ctypedef long mode_t
     ctypedef long nlink_t
     ctypedef long off_t
diff --git a/contrib/tools/cython/Cython/Includes/posix/unistd.pxd b/contrib/tools/cython/Cython/Includes/posix/unistd.pxd
index bd7c3daa49..1afeca3854 100644
--- a/contrib/tools/cython/Cython/Includes/posix/unistd.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/unistd.pxd
@@ -2,7 +2,7 @@
 
 from posix.types cimport gid_t, pid_t, off_t, uid_t
 
-cdef extern from "<unistd.h>" nogil: 
+cdef extern from "<unistd.h>" nogil:
 
     #:NULL
 
diff --git a/contrib/tools/cython/Cython/Includes/posix/wait.pxd b/contrib/tools/cython/Cython/Includes/posix/wait.pxd
index 6041d02eb1..d18cff9cf8 100644
--- a/contrib/tools/cython/Cython/Includes/posix/wait.pxd
+++ b/contrib/tools/cython/Cython/Includes/posix/wait.pxd
@@ -1,38 +1,38 @@
-# http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/wait.h.html 
- 
-from posix.types cimport pid_t, id_t 
-from posix.signal cimport siginfo_t 
-from posix.resource cimport rusage 
- 
-cdef extern from "<sys/wait.h>" nogil: 
-    enum: WNOHANG 
-    enum: WUNTRACED 
-    enum: WCONTINUED 
-    enum: WEXITED 
-    enum: WSTOPPED 
-    enum: WNOWAIT 
- 
-    int WEXITSTATUS(int status) 
-    int WIFCONTINUED(int status) 
-    int WIFEXITED(int status) 
-    int WIFSIGNALED(int status) 
-    int WIFSTOPPED(int status) 
-    int WSTOPSIG(int status) 
-    int WTERMSIG(int status) 
- 
-    ctypedef int idtype_t 
-    enum: P_ALL             # idtype_t values 
-    enum: P_PID 
-    enum: P_PGID 
- 
-    pid_t wait(int *stat_loc) 
-    pid_t waitpid(pid_t pid, int *status, int options) 
-    int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options) 
- 
-# wait3 was in POSIX until 2008 while wait4 was never standardized. 
-# Even so, these calls are in almost every Unix, always in sys/wait.h. 
-# Hence, posix.wait is the least surprising place to declare them for Cython. 
-# libc may require _XXX_SOURCE to be defined at C-compile time to provide them. 
- 
-    pid_t wait3(int *status, int options, rusage *rusage) 
-    pid_t wait4(pid_t pid, int *status, int options, rusage *rusage) 
+# http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/wait.h.html
+
+from posix.types cimport pid_t, id_t
+from posix.signal cimport siginfo_t
+from posix.resource cimport rusage
+
+cdef extern from "<sys/wait.h>" nogil:
+    enum: WNOHANG
+    enum: WUNTRACED
+    enum: WCONTINUED
+    enum: WEXITED
+    enum: WSTOPPED
+    enum: WNOWAIT
+
+    int WEXITSTATUS(int status)
+    int WIFCONTINUED(int status)
+    int WIFEXITED(int status)
+    int WIFSIGNALED(int status)
+    int WIFSTOPPED(int status)
+    int WSTOPSIG(int status)
+    int WTERMSIG(int status)
+
+    ctypedef int idtype_t
+    enum: P_ALL             # idtype_t values
+    enum: P_PID
+    enum: P_PGID
+
+    pid_t wait(int *stat_loc)
+    pid_t waitpid(pid_t pid, int *status, int options)
+    int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options)
+
+# wait3 was in POSIX until 2008 while wait4 was never standardized.
+# Even so, these calls are in almost every Unix, always in sys/wait.h.
+# Hence, posix.wait is the least surprising place to declare them for Cython.
+# libc may require _XXX_SOURCE to be defined at C-compile time to provide them.
+
+    pid_t wait3(int *status, int options, rusage *rusage)
+    pid_t wait4(pid_t pid, int *status, int options, rusage *rusage)