mirror of
https://github.com/python/cpython.git
synced 2025-10-31 21:51:50 +00:00
[3.9] Remove trailing spaces (GH-28710)
This commit is contained in:
parent
d211e87307
commit
e9ce081ec7
8 changed files with 16 additions and 16 deletions
|
|
@ -3,7 +3,7 @@
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
PyObject *ptr; /* Cached pointer (borrowed reference) */
|
PyObject *ptr; /* Cached pointer (borrowed reference) */
|
||||||
uint64_t globals_ver; /* ma_version of global dict */
|
uint64_t globals_ver; /* ma_version of global dict */
|
||||||
|
|
|
||||||
|
|
@ -156,9 +156,9 @@ def _default_sysroot(cc):
|
||||||
|
|
||||||
if _cache_default_sysroot is not None:
|
if _cache_default_sysroot is not None:
|
||||||
return _cache_default_sysroot
|
return _cache_default_sysroot
|
||||||
|
|
||||||
contents = _read_output('%s -c -E -v - </dev/null' % (cc,), True)
|
contents = _read_output('%s -c -E -v - </dev/null' % (cc,), True)
|
||||||
in_incdirs = False
|
in_incdirs = False
|
||||||
for line in contents.splitlines():
|
for line in contents.splitlines():
|
||||||
if line.startswith("#include <...>"):
|
if line.startswith("#include <...>"):
|
||||||
in_incdirs = True
|
in_incdirs = True
|
||||||
|
|
|
||||||
|
|
@ -1034,7 +1034,7 @@ EXPORT (HRESULT) KeepObject(IUnknown *punk)
|
||||||
|
|
||||||
static struct PyModuleDef_Slot _ctypes_test_slots[] = {
|
static struct PyModuleDef_Slot _ctypes_test_slots[] = {
|
||||||
{0, NULL}
|
{0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct PyModuleDef _ctypes_testmodule = {
|
static struct PyModuleDef _ctypes_testmodule = {
|
||||||
PyModuleDef_HEAD_INIT,
|
PyModuleDef_HEAD_INIT,
|
||||||
|
|
|
||||||
|
|
@ -1484,14 +1484,14 @@ static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *ar
|
||||||
|
|
||||||
if (!PyArg_ParseTuple(args, "O", &name))
|
if (!PyArg_ParseTuple(args, "O", &name))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (name == Py_None)
|
if (name == Py_None)
|
||||||
Py_RETURN_FALSE;
|
Py_RETURN_FALSE;
|
||||||
|
|
||||||
if (PyUnicode_FSConverter(name, &name2) == 0)
|
if (PyUnicode_FSConverter(name, &name2) == 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
name_str = PyBytes_AS_STRING(name2);
|
name_str = PyBytes_AS_STRING(name2);
|
||||||
|
|
||||||
r = _dyld_shared_cache_contains_path(name_str);
|
r = _dyld_shared_cache_contains_path(name_str);
|
||||||
Py_DECREF(name2);
|
Py_DECREF(name2);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@
|
||||||
#define _Py_tzname tzname
|
#define _Py_tzname tzname
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__APPLE__ ) && defined(__has_builtin)
|
#if defined(__APPLE__ ) && defined(__has_builtin)
|
||||||
# if __has_builtin(__builtin_available)
|
# if __has_builtin(__builtin_available)
|
||||||
# define HAVE_CLOCK_GETTIME_RUNTIME __builtin_available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
|
# define HAVE_CLOCK_GETTIME_RUNTIME __builtin_available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
|
||||||
# endif
|
# endif
|
||||||
|
|
@ -160,7 +160,7 @@ perf_counter(_Py_clock_info_t *info)
|
||||||
#ifdef HAVE_CLOCK_GETTIME
|
#ifdef HAVE_CLOCK_GETTIME
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
/*
|
/*
|
||||||
* The clock_* functions will be removed from the module
|
* The clock_* functions will be removed from the module
|
||||||
* dict entirely when the C API is not available.
|
* dict entirely when the C API is not available.
|
||||||
*/
|
*/
|
||||||
|
|
@ -1421,7 +1421,7 @@ _PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
|
||||||
|
|
||||||
#if defined(__APPLE__) && defined(__has_attribute) && __has_attribute(availability)
|
#if defined(__APPLE__) && defined(__has_attribute) && __has_attribute(availability)
|
||||||
static int
|
static int
|
||||||
_PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
|
_PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
|
||||||
__attribute__((availability(macos, introduced=10.12)))
|
__attribute__((availability(macos, introduced=10.12)))
|
||||||
__attribute__((availability(ios, introduced=10.0)))
|
__attribute__((availability(ios, introduced=10.0)))
|
||||||
__attribute__((availability(tvos, introduced=10.0)))
|
__attribute__((availability(tvos, introduced=10.0)))
|
||||||
|
|
@ -1460,7 +1460,7 @@ _PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
|
||||||
|
|
||||||
#ifdef HAVE_THREAD_TIME
|
#ifdef HAVE_THREAD_TIME
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
/*
|
/*
|
||||||
* The clock_* functions will be removed from the module
|
* The clock_* functions will be removed from the module
|
||||||
* dict entirely when the C API is not available.
|
* dict entirely when the C API is not available.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -566,7 +566,7 @@ static PyGetSetDef ga_properties[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* A helper function to create GenericAlias' args tuple and set its attributes.
|
/* A helper function to create GenericAlias' args tuple and set its attributes.
|
||||||
* Returns 1 on success, 0 on failure.
|
* Returns 1 on success, 0 on failure.
|
||||||
*/
|
*/
|
||||||
static inline int
|
static inline int
|
||||||
setup_ga(gaobject *alias, PyObject *origin, PyObject *args) {
|
setup_ga(gaobject *alias, PyObject *origin, PyObject *args) {
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
# include <sanitizer/msan_interface.h>
|
# include <sanitizer/msan_interface.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__APPLE__) && defined(__has_builtin)
|
#if defined(__APPLE__) && defined(__has_builtin)
|
||||||
# if __has_builtin(__builtin_available)
|
# if __has_builtin(__builtin_available)
|
||||||
# define HAVE_GETENTRYPY_GETRANDOM_RUNTIME __builtin_available(macOS 10.12, iOS 10.10, tvOS 10.0, watchOS 3.0, *)
|
# define HAVE_GETENTRYPY_GETRANDOM_RUNTIME __builtin_available(macOS 10.12, iOS 10.10, tvOS 10.0, watchOS 3.0, *)
|
||||||
# endif
|
# endif
|
||||||
|
|
@ -221,7 +221,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int blocking, int raise)
|
||||||
|
|
||||||
#if defined(__APPLE__) && defined(__has_attribute) && __has_attribute(availability)
|
#if defined(__APPLE__) && defined(__has_attribute) && __has_attribute(availability)
|
||||||
static int
|
static int
|
||||||
py_getentropy(char *buffer, Py_ssize_t size, int raise)
|
py_getentropy(char *buffer, Py_ssize_t size, int raise)
|
||||||
__attribute__((availability(macos,introduced=10.12)))
|
__attribute__((availability(macos,introduced=10.12)))
|
||||||
__attribute__((availability(ios,introduced=10.0)))
|
__attribute__((availability(ios,introduced=10.0)))
|
||||||
__attribute__((availability(tvos,introduced=10.0)))
|
__attribute__((availability(tvos,introduced=10.0)))
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
#if defined(__APPLE__)
|
#if defined(__APPLE__)
|
||||||
#include <mach/mach_time.h> /* mach_absolute_time(), mach_timebase_info() */
|
#include <mach/mach_time.h> /* mach_absolute_time(), mach_timebase_info() */
|
||||||
|
|
||||||
#if defined(__APPLE__) && defined(__has_builtin)
|
#if defined(__APPLE__) && defined(__has_builtin)
|
||||||
# if __has_builtin(__builtin_available)
|
# if __has_builtin(__builtin_available)
|
||||||
# define HAVE_CLOCK_GETTIME_RUNTIME __builtin_available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
|
# define HAVE_CLOCK_GETTIME_RUNTIME __builtin_available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
|
||||||
# endif
|
# endif
|
||||||
|
|
@ -730,7 +730,7 @@ pygettimeofday(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_CLOCK_GETTIME_RUNTIME
|
#ifdef HAVE_CLOCK_GETTIME_RUNTIME
|
||||||
} else {
|
} else {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue