bpo-35081: Move Include/pyatomic.c to Include/internal/ (GH-10239)

Add pyatomic.h to the VS project (it wasn't referenced).
This commit is contained in:
Victor Stinner 2018-10-30 15:14:25 +01:00 committed by GitHub
parent 9204fb8623
commit 31368a4f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 23 additions and 10 deletions

View File

@ -53,8 +53,6 @@
#include "pyport.h"
#include "pymacro.h"
#include "pyatomic.h"
/* Debug-mode build with pymalloc implies PYMALLOC_DEBUG.
* PYMALLOC_DEBUG is in error if pymalloc is not in use.
*/

View File

@ -4,7 +4,7 @@
extern "C" {
#endif
#include "pyatomic.h"
#include "internal/pyatomic.h"
#include "pythread.h"
struct _pending_calls {

View File

@ -4,11 +4,11 @@
extern "C" {
#endif
#include "pyatomic.h"
#include "internal/condvar.h"
#include "internal/pyatomic.h"
#ifndef Py_HAVE_CONDVAR
#error You need either a POSIX-compatible or a Windows system!
# error You need either a POSIX-compatible or a Windows system!
#endif
/* Enable if you want to force the switching of threads at least

View File

@ -1,6 +1,12 @@
#ifndef Py_ATOMIC_H
#define Py_ATOMIC_H
#ifdef Py_BUILD_CORE
#ifdef __cplusplus
extern "C" {
#endif
#ifndef Py_BUILD_CORE
# error "Py_BUILD_CORE must be defined to include this header"
#endif
#include "dynamic_annotations.h"
@ -531,5 +537,8 @@ typedef struct _Py_atomic_int {
_Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, _Py_memory_order_relaxed)
#define _Py_atomic_load_relaxed(ATOMIC_VAL) \
_Py_atomic_load_explicit(ATOMIC_VAL, _Py_memory_order_relaxed)
#endif /* Py_BUILD_CORE */
#ifdef __cplusplus
}
#endif
#endif /* Py_ATOMIC_H */

View File

@ -5,7 +5,6 @@ extern "C" {
#endif
#include "pystate.h"
#include "pyatomic.h"
#include "pythread.h"
#include "internal/mem.h"

View File

@ -988,7 +988,6 @@ PYTHON_HEADERS= \
$(srcdir)/Include/pgen.h \
$(srcdir)/Include/pgenheaders.h \
$(srcdir)/Include/pyarena.h \
$(srcdir)/Include/pyatomic.h \
$(srcdir)/Include/pycapsule.h \
$(srcdir)/Include/pyctype.h \
$(srcdir)/Include/pydebug.h \
@ -1029,6 +1028,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/internal/ceval.h \
$(srcdir)/Include/internal/gil.h \
$(srcdir)/Include/internal/mem.h \
$(srcdir)/Include/internal/pyatomic.h \
$(srcdir)/Include/internal/pygetopt.h \
$(srcdir)/Include/internal/pystate.h \
$(srcdir)/Include/internal/context.h \

View File

@ -4,6 +4,8 @@
/* XXX Signals should be recorded per thread, now we have thread state. */
#include "Python.h"
#include "internal/pyatomic.h"
#ifndef MS_WINDOWS
#include "posixmodule.h"
#endif

View File

@ -118,6 +118,7 @@
<ClInclude Include="..\Include\internal\gil.h" />
<ClInclude Include="..\Include\internal\hamt.h" />
<ClInclude Include="..\Include\internal\mem.h" />
<ClInclude Include="..\Include\internal\pyatomic.h" />
<ClInclude Include="..\Include\internal\pystate.h" />
<ClInclude Include="..\Include\internal\warnings.h" />
<ClInclude Include="..\Include\intrcheck.h" />

View File

@ -153,6 +153,9 @@
<ClInclude Include="..\Include\internal\mem.h">
<Filter>Include</Filter>
</ClInclude>
<ClInclude Include="..\Include\internal\pyatomic.h">
<Filter>Include</Filter>
</ClInclude>
<ClInclude Include="..\Include\internal\pystate.h">
<Filter>Include</Filter>
</ClInclude>

View File

@ -5,6 +5,7 @@
#include <stdlib.h>
#include <errno.h>
#include "internal/pyatomic.h"
/* First some general settings */