diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2018-01-22 17:32:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 17:32:50 (GMT) |
| commit | 13ff24582c99dfb439b1af7295b401415e7eb05b (patch) | |
| tree | 6966d9e1247134dfee9db73b6b5a215bfa88baf4 /Include | |
| parent | b0a7a037b8fde56b62f886d5188bced7776777b4 (diff) | |
| download | cpython-13ff24582c99dfb439b1af7295b401415e7eb05b.zip cpython-13ff24582c99dfb439b1af7295b401415e7eb05b.tar.gz cpython-13ff24582c99dfb439b1af7295b401415e7eb05b.tar.bz2 | |
bpo-32593: Drop FreeBSD 9 and older support (#5232)
Drop support of FreeBSD 9 and older.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/py_curses.h | 34 | ||||
| -rw-r--r-- | Include/pyport.h | 12 |
2 files changed, 10 insertions, 36 deletions
diff --git a/Include/py_curses.h b/Include/py_curses.h index 597f419..0eebc36 100644 --- a/Include/py_curses.h +++ b/Include/py_curses.h @@ -12,31 +12,15 @@ #endif #endif /* __APPLE__ */ -#ifdef __FreeBSD__ -/* -** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards -** against multiple definition of wchar_t and wint_t. -*/ -#ifdef _XOPEN_SOURCE_EXTENDED -#ifndef __FreeBSD_version -#include <osreldate.h> -#endif -#if __FreeBSD_version >= 500000 -#ifndef __wchar_t -#define __wchar_t -#endif -#ifndef __wint_t -#define __wint_t -#endif -#else -#ifndef _WCHAR_T -#define _WCHAR_T -#endif -#ifndef _WINT_T -#define _WINT_T -#endif -#endif -#endif +/* On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards + against multiple definition of wchar_t and wint_t. */ +#if defined(__FreeBSD__) && defined(_XOPEN_SOURCE_EXTENDED) +# ifndef __wchar_t +# define __wchar_t +# endif +# ifndef __wint_t +# define __wint_t +# endif #endif #if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS) diff --git a/Include/pyport.h b/Include/pyport.h index f2e247a..c1f4c7f 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -564,18 +564,8 @@ extern char * _getpty(int *, int, mode_t, int); * workaround was provided by Tim Robbins of FreeBSD project. */ -#ifdef __FreeBSD__ -#include <osreldate.h> -#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \ - (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \ - (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001) -# define _PY_PORT_CTYPE_UTF8_ISSUE -#endif -#endif - - #if defined(__APPLE__) -# define _PY_PORT_CTYPE_UTF8_ISSUE +# define _PY_PORT_CTYPE_UTF8_ISSUE #endif #ifdef _PY_PORT_CTYPE_UTF8_ISSUE |