merge 0.18 branch back into master

871da512 · Stefan Behnel · 0964e2b1 · f2889b8c · 871da512 · 871da512
Commit 871da512 authored Jan 18, 2013 by Stefan Behnel
Showing with 3 additions and 3 deletions

Cython/Includes/libc/locale.pxd Cython/Includes/libc/locale.pxd +1 -1

Cython/Includes/libc/stdio.pxd Cython/Includes/libc/stdio.pxd +1 -1

Cython/Includes/libc/stdlib.pxd Cython/Includes/libc/stdlib.pxd +1 -1

No files found.
--- a/Cython/Includes/libc/locale.pxd
+++ b/Cython/Includes/libc/locale.pxd
 # 7.11 Localization <locale.h>

 # deprecated cimport for backwards compatibility:
-from .string cimport const_char
+from libc.string cimport const_char


 cdef extern from "locale.h" nogil:

--- a/Cython/Includes/libc/stdio.pxd
+++ b/Cython/Includes/libc/stdio.pxd
@@ -2,7 +2,7 @@


 # deprecated cimports for backwards compatibility:
-from .string cimport const_char, const_void
+from libc.string cimport const_char, const_void


 cdef extern from "stdio.h" nogil:

--- a/Cython/Includes/libc/stdlib.pxd
+++ b/Cython/Includes/libc/stdlib.pxd
 # 7.20 General utilities <stdlib.h>

 # deprecated cimports for backwards compatibility:
-from .string cimport const_char, const_void
+from libc.string cimport const_char, const_void


 cdef extern from "stdlib.h" nogil: