FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.15] gh-149685: Use the _Py prefix for private C macros (GH-149686)… · python/cpython@63a4007 · GitHub

  1. python
  2. cpython

Repository navigation

Commit 63a4007

Browse files
miss-islington
and
encukou
authored
[3.15] gh-149685: Use the _Py prefix for private C macros (GH-149686) (GH-149790)
(cherry picked from commit 125f263) Co-authored-by: Petr Viktorin <encukou@gmail.com>
1 parent fb35004 commit 63a4007

11 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎Include/cpython/sentinelobject.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* Sentinel object interface */
22

33
#ifndef Py_LIMITED_API
4-
#ifndef Py_SENTINELOBJECT_H
5-
#define Py_SENTINELOBJECT_H
4+
#ifndef _Py_SENTINELOBJECT_H
5+
#define _Py_SENTINELOBJECT_H
66
#ifdef __cplusplus
77
extern "C" {
88
#endif
@@ -21,5 +21,5 @@ PyAPI_FUNC(PyObject *) PySentinel_New(
2121
#ifdef __cplusplus
2222
}
2323
#endif
24-
#endif /* !Py_SENTINELOBJECT_H */
24+
#endif /* !_Py_SENTINELOBJECT_H */
2525
#endif /* !Py_LIMITED_API */

‎Include/cpython/sliceobject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ifndef Py_CPYTHON_SLICEOBJECT_H
1+
#ifndef _Py_CPYTHON_SLICEOBJECT_H
22
# error "this header file must not be included directly"
33
#endif
44

‎Include/cpython/structseq.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ifndef Py_CPYTHON_STRUCTSEQ_H
1+
#ifndef _Py_CPYTHON_STRUCTSEQ_H
22
# error "this header file must not be included directly"
33
#endif
44

‎Include/internal/pycore_jit_unwind.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#if defined(_Py_JIT) && defined(__linux__) && defined(__ELF__)
1212
# define PY_HAVE_JIT_GDB_UNWIND
1313
# if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \
14-
defined(HAVE_LIBGCC_EH_FRAME_REGISTRATION)
14+
defined(_Py_HAVE_LIBGCC_EH_FRAME_REGISTRATION)
1515
# define PY_HAVE_JIT_GNU_BACKTRACE_UNWIND
1616
# endif
1717
#endif

‎Include/internal/pycore_mmap.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ extern "C" {
1111

1212
#include "pycore_pystate.h"
1313

14-
#if defined(HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
14+
#if defined(_Py_HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
1515
# include <linux/prctl.h>
1616
# include <sys/prctl.h>
1717
#endif
1818

19-
#if defined(HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
19+
#if defined(_Py_HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
2020
static inline int
2121
_PyAnnotateMemoryMap(void *addr, size_t size, const char *name)
2222
{

‎Include/sliceobject.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length,
4545
#endif
4646

4747
#ifndef Py_LIMITED_API
48-
# define Py_CPYTHON_SLICEOBJECT_H
48+
# define _Py_CPYTHON_SLICEOBJECT_H
4949
# include "cpython/sliceobject.h"
50-
# undef Py_CPYTHON_SLICEOBJECT_H
50+
# undef _Py_CPYTHON_SLICEOBJECT_H
5151
#endif
5252

5353
#ifdef __cplusplus

‎Include/structseq.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ PyAPI_FUNC(void) PyStructSequence_SetItem(PyObject*, Py_ssize_t, PyObject*);
2929
PyAPI_FUNC(PyObject*) PyStructSequence_GetItem(PyObject*, Py_ssize_t);
3030

3131
#ifndef Py_LIMITED_API
32-
# define Py_CPYTHON_STRUCTSEQ_H
32+
# define _Py_CPYTHON_STRUCTSEQ_H
3333
# include "cpython/structseq.h"
34-
# undef Py_CPYTHON_STRUCTSEQ_H
34+
# undef _Py_CPYTHON_STRUCTSEQ_H
3535
#endif
3636

3737
#ifdef __cplusplus

‎Python/pystrhex.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _Py_hexlify_scalar(const unsigned char *src, Py_UCS1 *dst, Py_ssize_t len)
3636
adds a ton of complication. Who ever really hexes huge data?
3737
The 16-64 byte boosts align nicely with md5 - sha512 hexdigests.
3838
*/
39-
#ifdef HAVE_EFFICIENT_BUILTIN_SHUFFLEVECTOR
39+
#ifdef _Py_HAVE_EFFICIENT_BUILTIN_SHUFFLEVECTOR
4040

4141
/* 128-bit vector of 16 unsigned bytes */
4242
typedef unsigned char v16u8 __attribute__((vector_size(16)));
@@ -110,7 +110,7 @@ _Py_hexlify_simd(const unsigned char *src, Py_UCS1 *dst, Py_ssize_t len)
110110
_Py_hexlify_scalar(src + i, dst, len - i);
111111
}
112112

113-
#endif /* HAVE_EFFICIENT_BUILTIN_SHUFFLEVECTOR */
113+
#endif /* _Py_HAVE_EFFICIENT_BUILTIN_SHUFFLEVECTOR */
114114

115115
static PyObject *
116116
_Py_strhex_impl(const char* argbuf, Py_ssize_t arglen,
@@ -191,7 +191,7 @@ _Py_strhex_impl(const char* argbuf, Py_ssize_t arglen,
191191
unsigned char c;
192192

193193
if (bytes_per_sep_group == 0) {
194-
#ifdef HAVE_EFFICIENT_BUILTIN_SHUFFLEVECTOR
194+
#ifdef _Py_HAVE_EFFICIENT_BUILTIN_SHUFFLEVECTOR
195195
if (arglen >= 16) {
196196
_Py_hexlify_simd((const unsigned char *)argbuf, retbuf, arglen);
197197
}

‎configure‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3863,7 +3863,7 @@ __deregister_frame(0);
38633863
[ac_cv_have_libgcc_eh_frame_registration=no])
38643864
])
38653865
AS_VAR_IF([ac_cv_have_libgcc_eh_frame_registration], [yes], [
3866-
AC_DEFINE([HAVE_LIBGCC_EH_FRAME_REGISTRATION], [1],
3866+
AC_DEFINE([_Py_HAVE_LIBGCC_EH_FRAME_REGISTRATION], [1],
38673867
[Define to 1 if libgcc __register_frame and __deregister_frame are linkable.])
38683868
])
38693869

@@ -5163,7 +5163,7 @@ AC_LINK_IFELSE([
51635163
])
51645164

51655165
AS_VAR_IF([ac_cv_efficient_builtin_shufflevector], [yes], [
5166-
AC_DEFINE([HAVE_EFFICIENT_BUILTIN_SHUFFLEVECTOR], [1],
5166+
AC_DEFINE([_Py_HAVE_EFFICIENT_BUILTIN_SHUFFLEVECTOR], [1],
51675167
[Define if compiler supports __builtin_shufflevector with 128-bit
51685168
vectors AND the target architecture has native SIMD (not just API
51695169
availability)])
@@ -5788,7 +5788,7 @@ AC_CHECK_DECLS([UT_NAMESIZE],
57885788
# musl libc redefines struct prctl_mm_map and conflicts with linux/prctl.h
57895789
AS_IF([test "$ac_cv_libc" != musl], [
57905790
AC_CHECK_DECLS([PR_SET_VMA_ANON_NAME],
5791-
[AC_DEFINE([HAVE_PR_SET_VMA_ANON_NAME], [1],
5791+
[AC_DEFINE([_Py_HAVE_PR_SET_VMA_ANON_NAME], [1],
57925792
[Define if you have the 'PR_SET_VMA_ANON_NAME' constant.])],
57935793
[],
57945794
[@%:@include <linux/prctl.h>

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL