diff options
author | spreis <spreis@yandex-team.ru> | 2022-02-10 16:47:13 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:13 +0300 |
commit | b49848d6e361b76904f094b7d5e10d6edea75afe (patch) | |
tree | 9814fbd1c3effac9b8377c5d604b367b14e2db55 /contrib/libs | |
parent | bcd1126cbd5d445cd0665d295198aa39c6ab8cbe (diff) | |
download | ydb-b49848d6e361b76904f094b7d5e10d6edea75afe.tar.gz |
Restoring authorship annotation for <spreis@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib/libs')
151 files changed, 1112 insertions, 1112 deletions
diff --git a/contrib/libs/crcutil/multiword_64_64_gcc_i386_mmx.cc b/contrib/libs/crcutil/multiword_64_64_gcc_i386_mmx.cc index ee3804ad42..6bd4ead5bd 100644 --- a/contrib/libs/crcutil/multiword_64_64_gcc_i386_mmx.cc +++ b/contrib/libs/crcutil/multiword_64_64_gcc_i386_mmx.cc @@ -95,7 +95,7 @@ template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx( const uint64 *table_word = &this->crc_word_[0][0]; asm( - "subl $2*4*8 - 1, %[end]\n" + "subl $2*4*8 - 1, %[end]\n" "cmpl %[src], %[end]\n" "jbe 2f\n" @@ -201,7 +201,7 @@ template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx( "2:\n" "movl %[table_word], %[table]\n" - "addl $2*4*8 - 8, %[end]\n" + "addl $2*4*8 - 8, %[end]\n" "cmpl %[src], %[end]\n" "jbe 4f\n" "3:\n" @@ -211,7 +211,7 @@ template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx( "cmpl %[src], %[end]\n" "ja 3b\n" "4:\n" - "addl $7, %[end]\n" + "addl $7, %[end]\n" "cmpl %[src], %[end]\n" "jbe 6f\n" diff --git a/contrib/libs/crcutil/ya.make b/contrib/libs/crcutil/ya.make index 3f46fa001c..2da8ef940f 100644 --- a/contrib/libs/crcutil/ya.make +++ b/contrib/libs/crcutil/ya.make @@ -23,25 +23,25 @@ ENDIF() IF (ARCH_I386 OR ARCH_X86_64) IF (OS_WINDOWS) - SRCS( - multiword_64_64_cl_i386_mmx.cc - ) + SRCS( + multiword_64_64_cl_i386_mmx.cc + ) ELSEIF (OS_ANDROID AND ARCH_I386) # 32-bit Android has some problems with register allocation, so we fall back to default implementation ELSE() IF (CLANG) CFLAGS(-DCRCUTIL_USE_MM_CRC32=1) - IF (ARCH_I386) - # clang doesn't support this as optimization attribute and has problems with register allocation + IF (ARCH_I386) + # clang doesn't support this as optimization attribute and has problems with register allocation SRC( multiword_64_64_gcc_i386_mmx.cc -fomit-frame-pointer ) - ELSE() + ELSE() SRCS( multiword_64_64_gcc_i386_mmx.cc ) - ENDIF() + ENDIF() ELSE() CFLAGS( -mcrc32 diff --git a/contrib/libs/cxxsupp/openmp/kmp_utility.c b/contrib/libs/cxxsupp/openmp/kmp_utility.c index 860111cc66..c777d7dc0c 100644 --- a/contrib/libs/cxxsupp/openmp/kmp_utility.c +++ b/contrib/libs/cxxsupp/openmp/kmp_utility.c @@ -19,10 +19,10 @@ #include <float.h> #include "kmp_i18n.h" -#include <util/system/types.h> - -const char* CpuBrand(ui32 store[12]) noexcept; //defined in <util/system/cpu_id.h> - +#include <util/system/types.h> + +const char* CpuBrand(ui32 store[12]) noexcept; //defined in <util/system/cpu_id.h> + /* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */ diff --git a/contrib/libs/cxxsupp/openmp/ya.make b/contrib/libs/cxxsupp/openmp/ya.make index 969a4f4825..2c64468375 100644 --- a/contrib/libs/cxxsupp/openmp/ya.make +++ b/contrib/libs/cxxsupp/openmp/ya.make @@ -39,8 +39,8 @@ COMPILE_C_AS_CXX() CXXFLAGS(-fno-exceptions) -SET_APPEND(CFLAGS -fno-lto) - +SET_APPEND(CFLAGS -fno-lto) + ADDINCL( GLOBAL contrib/libs/cxxsupp/openmp ) diff --git a/contrib/libs/grpc/python/ya.make b/contrib/libs/grpc/python/ya.make index 1160c76ed2..f22d3393fc 100644 --- a/contrib/libs/grpc/python/ya.make +++ b/contrib/libs/grpc/python/ya.make @@ -1,4 +1,4 @@ -PY23_LIBRARY() +PY23_LIBRARY() WITHOUT_LICENSE_TEXTS() diff --git a/contrib/libs/grpc/src/python/grpcio/ya.make b/contrib/libs/grpc/src/python/grpcio/ya.make index 65766500ed..5cdb0230c4 100644 --- a/contrib/libs/grpc/src/python/grpcio/ya.make +++ b/contrib/libs/grpc/src/python/grpcio/ya.make @@ -1,4 +1,4 @@ -PY23_LIBRARY() +PY23_LIBRARY() LICENSE(Apache-2.0) @@ -15,13 +15,13 @@ PEERDIR( contrib/python/six ) -IF (PYTHON2) - PEERDIR( - contrib/python/enum34 - contrib/python/futures - ) -ENDIF() - +IF (PYTHON2) + PEERDIR( + contrib/python/enum34 + contrib/python/futures + ) +ENDIF() + ADDINCL( ${ARCADIA_BUILD_ROOT}/contrib/libs/grpc contrib/libs/grpc diff --git a/contrib/libs/libaio/dynamic/libaio.exports b/contrib/libs/libaio/dynamic/libaio.exports index 9de59b0572..c38b5ae9c7 100644 --- a/contrib/libs/libaio/dynamic/libaio.exports +++ b/contrib/libs/libaio/dynamic/libaio.exports @@ -1,9 +1,9 @@ -C io_queue_init -C io_queue_release -C io_queue_run -C io_setup -C io_destroy -C io_submit -C io_cancel -C io_getevents - +C io_queue_init +C io_queue_release +C io_queue_run +C io_setup +C io_destroy +C io_submit +C io_cancel +C io_getevents + diff --git a/contrib/libs/libaio/dynamic/ya.make b/contrib/libs/libaio/dynamic/ya.make index ea2335a5f0..fd2096f7aa 100644 --- a/contrib/libs/libaio/dynamic/ya.make +++ b/contrib/libs/libaio/dynamic/ya.make @@ -1,10 +1,10 @@ -DYNAMIC_LIBRARY(aio) - -OWNER( - g:contrib - g:cpp-contrib -) - +DYNAMIC_LIBRARY(aio) + +OWNER( + g:contrib + g:cpp-contrib +) + IF (ARCH_ARMV7 OR ARCH_ARM64) LICENSE( GPL-2.0-only AND @@ -17,15 +17,15 @@ ELSE() LGPL-2.1-only ) ENDIF() - + LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -EXPORTS_SCRIPT(libaio.exports) - -NO_RUNTIME() - -PROVIDES(libaio) - -DYNAMIC_LIBRARY_FROM(contrib/libs/libaio/static) - -END() +EXPORTS_SCRIPT(libaio.exports) + +NO_RUNTIME() + +PROVIDES(libaio) + +DYNAMIC_LIBRARY_FROM(contrib/libs/libaio/static) + +END() diff --git a/contrib/libs/libaio/static/ya.make b/contrib/libs/libaio/static/ya.make index 48dc53244e..c4a7e200bb 100644 --- a/contrib/libs/libaio/static/ya.make +++ b/contrib/libs/libaio/static/ya.make @@ -26,14 +26,14 @@ NO_UTIL() NO_RUNTIME() -PROVIDES(libaio) - -SRCDIR(contrib/libs/libaio) +PROVIDES(libaio) + +SRCDIR(contrib/libs/libaio) ADDINCL( contrib/libs/libaio ) - + SRCS( io_cancel.c io_destroy.c diff --git a/contrib/libs/libaio/ya.make b/contrib/libs/libaio/ya.make index ef27ed040a..3eb09b549b 100644 --- a/contrib/libs/libaio/ya.make +++ b/contrib/libs/libaio/ya.make @@ -10,25 +10,25 @@ WITHOUT_LICENSE_TEXTS() VERSION(2015-07-01-5a546a834c36070648158d19dd564762d59f8eb8) OWNER( - g:contrib - g:cpp-contrib + g:contrib + g:cpp-contrib ) NO_RUNTIME() -IF (USE_DYNAMIC_AIO) - PEERDIR( - contrib/libs/libaio/dynamic - ) -ELSE() - PEERDIR( - contrib/libs/libaio/static - ) -ENDIF() +IF (USE_DYNAMIC_AIO) + PEERDIR( + contrib/libs/libaio/dynamic + ) +ELSE() + PEERDIR( + contrib/libs/libaio/static + ) +ENDIF() END() - -RECURSE( - dynamic - static -) + +RECURSE( + dynamic + static +) diff --git a/contrib/libs/libiconv/dynamic/ya.make b/contrib/libs/libiconv/dynamic/ya.make index 8e7d7b49e2..f3a979206c 100644 --- a/contrib/libs/libiconv/dynamic/ya.make +++ b/contrib/libs/libiconv/dynamic/ya.make @@ -1,4 +1,4 @@ -DYNAMIC_LIBRARY(iconv) +DYNAMIC_LIBRARY(iconv) OWNER( g:contrib g:cpp-contrib @@ -13,12 +13,12 @@ LICENSE( LICENSE_TEXTS(../.yandex_meta/licenses.list.txt) -PROVIDES(libiconv) - +PROVIDES(libiconv) + NO_RUNTIME() -EXPORTS_SCRIPT(libiconv.exports) +EXPORTS_SCRIPT(libiconv.exports) + +DYNAMIC_LIBRARY_FROM(contrib/libs/libiconv/static) -DYNAMIC_LIBRARY_FROM(contrib/libs/libiconv/static) - END() diff --git a/contrib/libs/libiconv/static/ya.make b/contrib/libs/libiconv/static/ya.make index 13b69884c3..83009f7ed9 100644 --- a/contrib/libs/libiconv/static/ya.make +++ b/contrib/libs/libiconv/static/ya.make @@ -14,8 +14,8 @@ LICENSE( LICENSE_TEXTS(../.yandex_meta/licenses.list.txt) -PROVIDES(libiconv) - +PROVIDES(libiconv) + NO_RUNTIME() NO_COMPILER_WARNINGS() diff --git a/contrib/libs/libidn/dynamic/libidn.exports b/contrib/libs/libidn/dynamic/libidn.exports index 394421b879..586b60a0f8 100644 --- a/contrib/libs/libidn/dynamic/libidn.exports +++ b/contrib/libs/libidn/dynamic/libidn.exports @@ -1,7 +1,7 @@ C idna_to_ascii_4i C idna_to_unicode_44i -C idna_to_ascii_4z -C idna_to_unicode_44z +C idna_to_ascii_4z +C idna_to_unicode_44z C punycode_encode C punycode_strerror C punycode_decode diff --git a/contrib/libs/libidn/dynamic/ya.make b/contrib/libs/libidn/dynamic/ya.make index 9c1469e0e9..c307c1950f 100644 --- a/contrib/libs/libidn/dynamic/ya.make +++ b/contrib/libs/libidn/dynamic/ya.make @@ -1,12 +1,12 @@ OWNER( - g:contrib - g:cpp-contrib + g:contrib + g:cpp-contrib ) - -DYNAMIC_LIBRARY(idn) -VERSION(1.9) - +DYNAMIC_LIBRARY(idn) + +VERSION(1.9) + LICENSE( Custom-Punycode Ietf @@ -14,17 +14,17 @@ LICENSE( LGPL-2.1-only LGPL-2.1-or-later ) - + LICENSE_TEXTS(../.yandex_meta/licenses.list.txt) -VERSION(1.9) - -PROVIDES(libidn) - -NO_RUNTIME() - -EXPORTS_SCRIPT(libidn.exports) - -DYNAMIC_LIBRARY_FROM(contrib/libs/libidn/static) - -END() +VERSION(1.9) + +PROVIDES(libidn) + +NO_RUNTIME() + +EXPORTS_SCRIPT(libidn.exports) + +DYNAMIC_LIBRARY_FROM(contrib/libs/libidn/static) + +END() diff --git a/contrib/libs/libidn/static/ya.make b/contrib/libs/libidn/static/ya.make index cc7893a1aa..a927d7918e 100644 --- a/contrib/libs/libidn/static/ya.make +++ b/contrib/libs/libidn/static/ya.make @@ -17,8 +17,8 @@ LICENSE_TEXTS(../.yandex_meta/licenses.list.txt) VERSION(1.9) -PROVIDES(libidn) - +PROVIDES(libidn) + NO_RUNTIME() NO_COMPILER_WARNINGS() diff --git a/contrib/libs/protobuf/builtin_proto/protos_from_protobuf/ya.make b/contrib/libs/protobuf/builtin_proto/protos_from_protobuf/ya.make index 739efa8d9d..67c9827f57 100644 --- a/contrib/libs/protobuf/builtin_proto/protos_from_protobuf/ya.make +++ b/contrib/libs/protobuf/builtin_proto/protos_from_protobuf/ya.make @@ -1,4 +1,4 @@ -PROTO_LIBRARY() +PROTO_LIBRARY() WITHOUT_LICENSE_TEXTS() @@ -6,27 +6,27 @@ LICENSE(BSD-3-Clause) OWNER(g:yatool) -EXCLUDE_TAGS( - CPP_PROTO - GO_PROTO -) - -NO_MYPY() - -NO_OPTIMIZE_PY_PROTOS() - -DISABLE(NEED_GOOGLE_PROTO_PEERDIRS) - +EXCLUDE_TAGS( + CPP_PROTO + GO_PROTO +) + +NO_MYPY() + +NO_OPTIMIZE_PY_PROTOS() + +DISABLE(NEED_GOOGLE_PROTO_PEERDIRS) + PY_NAMESPACE(.) -PROTO_NAMESPACE( - GLOBAL - contrib/libs/protobuf/src -) +PROTO_NAMESPACE( + GLOBAL + contrib/libs/protobuf/src +) SRCDIR(contrib/libs/protobuf/src) -SRCS( +SRCS( google/protobuf/any.proto google/protobuf/api.proto google/protobuf/descriptor.proto diff --git a/contrib/libs/protobuf/builtin_proto/protos_from_protoc/ya.make b/contrib/libs/protobuf/builtin_proto/protos_from_protoc/ya.make index 62c1a66a7c..5c8bbc335e 100644 --- a/contrib/libs/protobuf/builtin_proto/protos_from_protoc/ya.make +++ b/contrib/libs/protobuf/builtin_proto/protos_from_protoc/ya.make @@ -1,4 +1,4 @@ -PROTO_LIBRARY() +PROTO_LIBRARY() WITHOUT_LICENSE_TEXTS() @@ -6,17 +6,17 @@ LICENSE(BSD-3-Clause) OWNER(g:yatool) -EXCLUDE_TAGS( - CPP_PROTO - GO_PROTO +EXCLUDE_TAGS( + CPP_PROTO + GO_PROTO ) -NO_MYPY() - -NO_OPTIMIZE_PY_PROTOS() - -DISABLE(NEED_GOOGLE_PROTO_PEERDIRS) - +NO_MYPY() + +NO_OPTIMIZE_PY_PROTOS() + +DISABLE(NEED_GOOGLE_PROTO_PEERDIRS) + PY_NAMESPACE(.) PROTO_NAMESPACE( @@ -26,12 +26,12 @@ PROTO_NAMESPACE( SRCDIR(contrib/libs/protoc/src) -PEERDIR( - contrib/libs/protobuf/builtin_proto/protos_from_protobuf -) +PEERDIR( + contrib/libs/protobuf/builtin_proto/protos_from_protobuf +) + +SRCS( + google/protobuf/compiler/plugin.proto +) -SRCS( - google/protobuf/compiler/plugin.proto -) - END() diff --git a/contrib/libs/protobuf/builtin_proto/ya.make b/contrib/libs/protobuf/builtin_proto/ya.make index 14d03b6aab..6ef4f74f34 100644 --- a/contrib/libs/protobuf/builtin_proto/ya.make +++ b/contrib/libs/protobuf/builtin_proto/ya.make @@ -1,8 +1,8 @@ -OWNER( - g:yatool -) - -RECURSE( - protos_from_protobuf - protos_from_protoc -) +OWNER( + g:yatool +) + +RECURSE( + protos_from_protobuf + protos_from_protoc +) diff --git a/contrib/libs/protobuf/ya.make b/contrib/libs/protobuf/ya.make index 6addc6e8d2..044e24badd 100644 --- a/contrib/libs/protobuf/ya.make +++ b/contrib/libs/protobuf/ya.make @@ -143,7 +143,7 @@ FILES( ) END() - -RECURSE( - builtin_proto -) + +RECURSE( + builtin_proto +) diff --git a/contrib/libs/python/Include/Python-ast.h b/contrib/libs/python/Include/Python-ast.h index eb8881242c..7628fd5a2a 100644 --- a/contrib/libs/python/Include/Python-ast.h +++ b/contrib/libs/python/Include/Python-ast.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/Python-ast.h> -#else -#include <contrib/tools/python/src/Include/Python-ast.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/Python-ast.h> +#else +#include <contrib/tools/python/src/Include/Python-ast.h> +#endif diff --git a/contrib/libs/python/Include/Python.h b/contrib/libs/python/Include/Python.h index 2b2099e943..5aa4c0b515 100644 --- a/contrib/libs/python/Include/Python.h +++ b/contrib/libs/python/Include/Python.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/Python.h> -#else -#include <contrib/tools/python/src/Include/Python.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/Python.h> +#else +#include <contrib/tools/python/src/Include/Python.h> +#endif diff --git a/contrib/libs/python/Include/abstract.h b/contrib/libs/python/Include/abstract.h index a41ac2b272..3073b25e25 100644 --- a/contrib/libs/python/Include/abstract.h +++ b/contrib/libs/python/Include/abstract.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/abstract.h> -#else -#include <contrib/tools/python/src/Include/abstract.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/abstract.h> +#else +#include <contrib/tools/python/src/Include/abstract.h> +#endif diff --git a/contrib/libs/python/Include/accu.h b/contrib/libs/python/Include/accu.h index 1e4a913828..acd0f68a6a 100644 --- a/contrib/libs/python/Include/accu.h +++ b/contrib/libs/python/Include/accu.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/accu.h> -#else -#error "No <accu.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/accu.h> +#else +#error "No <accu.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/asdl.h b/contrib/libs/python/Include/asdl.h index 9e6e361386..2f73d8ca48 100644 --- a/contrib/libs/python/Include/asdl.h +++ b/contrib/libs/python/Include/asdl.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/asdl.h> -#else -#include <contrib/tools/python/src/Include/asdl.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/asdl.h> +#else +#include <contrib/tools/python/src/Include/asdl.h> +#endif diff --git a/contrib/libs/python/Include/ast.h b/contrib/libs/python/Include/ast.h index 283cbbd86b..124a7c1497 100644 --- a/contrib/libs/python/Include/ast.h +++ b/contrib/libs/python/Include/ast.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/ast.h> -#else -#include <contrib/tools/python/src/Include/ast.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/ast.h> +#else +#include <contrib/tools/python/src/Include/ast.h> +#endif diff --git a/contrib/libs/python/Include/bitset.h b/contrib/libs/python/Include/bitset.h index a4e3fbd059..7e7a26c769 100644 --- a/contrib/libs/python/Include/bitset.h +++ b/contrib/libs/python/Include/bitset.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/bitset.h> -#else -#include <contrib/tools/python/src/Include/bitset.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/bitset.h> +#else +#include <contrib/tools/python/src/Include/bitset.h> +#endif diff --git a/contrib/libs/python/Include/bltinmodule.h b/contrib/libs/python/Include/bltinmodule.h index 3abe078c86..0cd2a7ac76 100644 --- a/contrib/libs/python/Include/bltinmodule.h +++ b/contrib/libs/python/Include/bltinmodule.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/bltinmodule.h> -#else -#error "No <bltinmodule.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/bltinmodule.h> +#else +#error "No <bltinmodule.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/boolobject.h b/contrib/libs/python/Include/boolobject.h index 59a6c1814d..9ab8bbe43c 100644 --- a/contrib/libs/python/Include/boolobject.h +++ b/contrib/libs/python/Include/boolobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/boolobject.h> -#else -#include <contrib/tools/python/src/Include/boolobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/boolobject.h> +#else +#include <contrib/tools/python/src/Include/boolobject.h> +#endif diff --git a/contrib/libs/python/Include/bufferobject.h b/contrib/libs/python/Include/bufferobject.h index 8218812e79..aed38f50a9 100644 --- a/contrib/libs/python/Include/bufferobject.h +++ b/contrib/libs/python/Include/bufferobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <bufferobject.h> in Python3" -#else -#include <contrib/tools/python/src/Include/bufferobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <bufferobject.h> in Python3" +#else +#include <contrib/tools/python/src/Include/bufferobject.h> +#endif diff --git a/contrib/libs/python/Include/bytearrayobject.h b/contrib/libs/python/Include/bytearrayobject.h index 463569e394..0e69010be7 100644 --- a/contrib/libs/python/Include/bytearrayobject.h +++ b/contrib/libs/python/Include/bytearrayobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/bytearrayobject.h> -#else -#include <contrib/tools/python/src/Include/bytearrayobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/bytearrayobject.h> +#else +#include <contrib/tools/python/src/Include/bytearrayobject.h> +#endif diff --git a/contrib/libs/python/Include/bytes_methods.h b/contrib/libs/python/Include/bytes_methods.h index 7468e1e129..f74e146029 100644 --- a/contrib/libs/python/Include/bytes_methods.h +++ b/contrib/libs/python/Include/bytes_methods.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 +#pragma once + +#ifdef USE_PYTHON3 #error "No <bytes_methods.h> in Python3" -#else -#include <contrib/tools/python/src/Include/bytes_methods.h> -#endif +#else +#include <contrib/tools/python/src/Include/bytes_methods.h> +#endif diff --git a/contrib/libs/python/Include/bytesobject.h b/contrib/libs/python/Include/bytesobject.h index 307c6b432d..ca972c3df2 100644 --- a/contrib/libs/python/Include/bytesobject.h +++ b/contrib/libs/python/Include/bytesobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/bytesobject.h> -#else -#include <contrib/tools/python/src/Include/bytesobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/bytesobject.h> +#else +#include <contrib/tools/python/src/Include/bytesobject.h> +#endif diff --git a/contrib/libs/python/Include/cStringIO.h b/contrib/libs/python/Include/cStringIO.h index 07c32840e1..3a8a908d56 100644 --- a/contrib/libs/python/Include/cStringIO.h +++ b/contrib/libs/python/Include/cStringIO.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <cStringIO.h> in Python3" -#else -#include <contrib/tools/python/src/Include/cStringIO.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <cStringIO.h> in Python3" +#else +#include <contrib/tools/python/src/Include/cStringIO.h> +#endif diff --git a/contrib/libs/python/Include/cellobject.h b/contrib/libs/python/Include/cellobject.h index 95fb27e553..3345daa7fd 100644 --- a/contrib/libs/python/Include/cellobject.h +++ b/contrib/libs/python/Include/cellobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/cellobject.h> -#else -#include <contrib/tools/python/src/Include/cellobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/cellobject.h> +#else +#include <contrib/tools/python/src/Include/cellobject.h> +#endif diff --git a/contrib/libs/python/Include/ceval.h b/contrib/libs/python/Include/ceval.h index 6f630d1f9f..f169fdbe79 100644 --- a/contrib/libs/python/Include/ceval.h +++ b/contrib/libs/python/Include/ceval.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/ceval.h> -#else -#include <contrib/tools/python/src/Include/ceval.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/ceval.h> +#else +#include <contrib/tools/python/src/Include/ceval.h> +#endif diff --git a/contrib/libs/python/Include/classobject.h b/contrib/libs/python/Include/classobject.h index 1f407b3a44..6f7a4f5e6e 100644 --- a/contrib/libs/python/Include/classobject.h +++ b/contrib/libs/python/Include/classobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/classobject.h> -#else -#include <contrib/tools/python/src/Include/classobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/classobject.h> +#else +#include <contrib/tools/python/src/Include/classobject.h> +#endif diff --git a/contrib/libs/python/Include/cobject.h b/contrib/libs/python/Include/cobject.h index d12c552e7e..8fd2754e01 100644 --- a/contrib/libs/python/Include/cobject.h +++ b/contrib/libs/python/Include/cobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <cobject.h> in Python3" -#else -#include <contrib/tools/python/src/Include/cobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <cobject.h> in Python3" +#else +#include <contrib/tools/python/src/Include/cobject.h> +#endif diff --git a/contrib/libs/python/Include/code.h b/contrib/libs/python/Include/code.h index 863de6b03b..e21d9c3ce3 100644 --- a/contrib/libs/python/Include/code.h +++ b/contrib/libs/python/Include/code.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/code.h> -#else -#include <contrib/tools/python/src/Include/code.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/code.h> +#else +#include <contrib/tools/python/src/Include/code.h> +#endif diff --git a/contrib/libs/python/Include/codecs.h b/contrib/libs/python/Include/codecs.h index 3494dda4bd..52f76040fb 100644 --- a/contrib/libs/python/Include/codecs.h +++ b/contrib/libs/python/Include/codecs.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/codecs.h> -#else -#include <contrib/tools/python/src/Include/codecs.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/codecs.h> +#else +#include <contrib/tools/python/src/Include/codecs.h> +#endif diff --git a/contrib/libs/python/Include/compile.h b/contrib/libs/python/Include/compile.h index 78c2ea1129..eb3595aab0 100644 --- a/contrib/libs/python/Include/compile.h +++ b/contrib/libs/python/Include/compile.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/compile.h> -#else -#include <contrib/tools/python/src/Include/compile.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/compile.h> +#else +#include <contrib/tools/python/src/Include/compile.h> +#endif diff --git a/contrib/libs/python/Include/complexobject.h b/contrib/libs/python/Include/complexobject.h index 10ce9a2c9c..2c510c47f4 100644 --- a/contrib/libs/python/Include/complexobject.h +++ b/contrib/libs/python/Include/complexobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/complexobject.h> -#else -#include <contrib/tools/python/src/Include/complexobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/complexobject.h> +#else +#include <contrib/tools/python/src/Include/complexobject.h> +#endif diff --git a/contrib/libs/python/Include/config_platform.h b/contrib/libs/python/Include/config_platform.h index a424d09fe0..afd9bf5123 100644 --- a/contrib/libs/python/Include/config_platform.h +++ b/contrib/libs/python/Include/config_platform.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <config_platform.h> in Python3" -#else -#include <contrib/tools/python/src/Include/config_platform.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <config_platform.h> in Python3" +#else +#include <contrib/tools/python/src/Include/config_platform.h> +#endif diff --git a/contrib/libs/python/Include/datetime.h b/contrib/libs/python/Include/datetime.h index 33ee394fd4..b24acd5638 100644 --- a/contrib/libs/python/Include/datetime.h +++ b/contrib/libs/python/Include/datetime.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/datetime.h> -#else -#include <contrib/tools/python/src/Include/datetime.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/datetime.h> +#else +#include <contrib/tools/python/src/Include/datetime.h> +#endif diff --git a/contrib/libs/python/Include/descrobject.h b/contrib/libs/python/Include/descrobject.h index e5dc606093..5d450cf256 100644 --- a/contrib/libs/python/Include/descrobject.h +++ b/contrib/libs/python/Include/descrobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/descrobject.h> -#else -#include <contrib/tools/python/src/Include/descrobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/descrobject.h> +#else +#include <contrib/tools/python/src/Include/descrobject.h> +#endif diff --git a/contrib/libs/python/Include/dictobject.h b/contrib/libs/python/Include/dictobject.h index 4364a043c6..36026b4962 100644 --- a/contrib/libs/python/Include/dictobject.h +++ b/contrib/libs/python/Include/dictobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/dictobject.h> -#else -#include <contrib/tools/python/src/Include/dictobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/dictobject.h> +#else +#include <contrib/tools/python/src/Include/dictobject.h> +#endif diff --git a/contrib/libs/python/Include/dtoa.h b/contrib/libs/python/Include/dtoa.h index 4cc8661c6d..d8c51a71f4 100644 --- a/contrib/libs/python/Include/dtoa.h +++ b/contrib/libs/python/Include/dtoa.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 +#pragma once + +#ifdef USE_PYTHON3 #error "No <dtoa.h> in Python3" -#else -#include <contrib/tools/python/src/Include/dtoa.h> -#endif +#else +#include <contrib/tools/python/src/Include/dtoa.h> +#endif diff --git a/contrib/libs/python/Include/dynamic_annotations.h b/contrib/libs/python/Include/dynamic_annotations.h index 093fc3bcc8..0ffe86e787 100644 --- a/contrib/libs/python/Include/dynamic_annotations.h +++ b/contrib/libs/python/Include/dynamic_annotations.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/dynamic_annotations.h> -#else -#error "No <dynamic_annotations.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/dynamic_annotations.h> +#else +#error "No <dynamic_annotations.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/enumobject.h b/contrib/libs/python/Include/enumobject.h index 42953d0037..08d7a42ee4 100644 --- a/contrib/libs/python/Include/enumobject.h +++ b/contrib/libs/python/Include/enumobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/enumobject.h> -#else -#include <contrib/tools/python/src/Include/enumobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/enumobject.h> +#else +#include <contrib/tools/python/src/Include/enumobject.h> +#endif diff --git a/contrib/libs/python/Include/errcode.h b/contrib/libs/python/Include/errcode.h index 94f0ec5cf5..69259ee2f5 100644 --- a/contrib/libs/python/Include/errcode.h +++ b/contrib/libs/python/Include/errcode.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/errcode.h> -#else -#include <contrib/tools/python/src/Include/errcode.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/errcode.h> +#else +#include <contrib/tools/python/src/Include/errcode.h> +#endif diff --git a/contrib/libs/python/Include/eval.h b/contrib/libs/python/Include/eval.h index 62dec98d37..cc8c657b1e 100644 --- a/contrib/libs/python/Include/eval.h +++ b/contrib/libs/python/Include/eval.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/eval.h> -#else -#include <contrib/tools/python/src/Include/eval.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/eval.h> +#else +#include <contrib/tools/python/src/Include/eval.h> +#endif diff --git a/contrib/libs/python/Include/fileobject.h b/contrib/libs/python/Include/fileobject.h index 2eb3acf63d..ac3aa4c7a2 100644 --- a/contrib/libs/python/Include/fileobject.h +++ b/contrib/libs/python/Include/fileobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/fileobject.h> -#else -#include <contrib/tools/python/src/Include/fileobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/fileobject.h> +#else +#include <contrib/tools/python/src/Include/fileobject.h> +#endif diff --git a/contrib/libs/python/Include/fileutils.h b/contrib/libs/python/Include/fileutils.h index 814ac94a0c..86ca07a109 100644 --- a/contrib/libs/python/Include/fileutils.h +++ b/contrib/libs/python/Include/fileutils.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/fileutils.h> -#else -#error "No <fileutils.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/fileutils.h> +#else +#error "No <fileutils.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/floatobject.h b/contrib/libs/python/Include/floatobject.h index 32b171c404..d08083f632 100644 --- a/contrib/libs/python/Include/floatobject.h +++ b/contrib/libs/python/Include/floatobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/floatobject.h> -#else -#include <contrib/tools/python/src/Include/floatobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/floatobject.h> +#else +#include <contrib/tools/python/src/Include/floatobject.h> +#endif diff --git a/contrib/libs/python/Include/frameobject.h b/contrib/libs/python/Include/frameobject.h index ab94da0925..50168e372a 100644 --- a/contrib/libs/python/Include/frameobject.h +++ b/contrib/libs/python/Include/frameobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/frameobject.h> -#else -#include <contrib/tools/python/src/Include/frameobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/frameobject.h> +#else +#include <contrib/tools/python/src/Include/frameobject.h> +#endif diff --git a/contrib/libs/python/Include/funcobject.h b/contrib/libs/python/Include/funcobject.h index 012fd11af5..d0bde3deb4 100644 --- a/contrib/libs/python/Include/funcobject.h +++ b/contrib/libs/python/Include/funcobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/funcobject.h> -#else -#include <contrib/tools/python/src/Include/funcobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/funcobject.h> +#else +#include <contrib/tools/python/src/Include/funcobject.h> +#endif diff --git a/contrib/libs/python/Include/genobject.h b/contrib/libs/python/Include/genobject.h index 94cc9e0a89..78ce06ddc0 100644 --- a/contrib/libs/python/Include/genobject.h +++ b/contrib/libs/python/Include/genobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/genobject.h> -#else -#include <contrib/tools/python/src/Include/genobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/genobject.h> +#else +#include <contrib/tools/python/src/Include/genobject.h> +#endif diff --git a/contrib/libs/python/Include/graminit.h b/contrib/libs/python/Include/graminit.h index 31e5d90551..4b0a5e1a38 100644 --- a/contrib/libs/python/Include/graminit.h +++ b/contrib/libs/python/Include/graminit.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/graminit.h> -#else -#include <contrib/tools/python/src/Include/graminit.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/graminit.h> +#else +#include <contrib/tools/python/src/Include/graminit.h> +#endif diff --git a/contrib/libs/python/Include/grammar.h b/contrib/libs/python/Include/grammar.h index 37f32c08d3..d425d1bd75 100644 --- a/contrib/libs/python/Include/grammar.h +++ b/contrib/libs/python/Include/grammar.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/grammar.h> -#else -#include <contrib/tools/python/src/Include/grammar.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/grammar.h> +#else +#include <contrib/tools/python/src/Include/grammar.h> +#endif diff --git a/contrib/libs/python/Include/import.h b/contrib/libs/python/Include/import.h index a1c7f6e9d7..cfa6515cdf 100644 --- a/contrib/libs/python/Include/import.h +++ b/contrib/libs/python/Include/import.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/import.h> -#else -#include <contrib/tools/python/src/Include/import.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/import.h> +#else +#include <contrib/tools/python/src/Include/import.h> +#endif diff --git a/contrib/libs/python/Include/intobject.h b/contrib/libs/python/Include/intobject.h index 6696f97641..4ec1b915df 100644 --- a/contrib/libs/python/Include/intobject.h +++ b/contrib/libs/python/Include/intobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <intobject.h> in Python3" -#else -#include <contrib/tools/python/src/Include/intobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <intobject.h> in Python3" +#else +#include <contrib/tools/python/src/Include/intobject.h> +#endif diff --git a/contrib/libs/python/Include/intrcheck.h b/contrib/libs/python/Include/intrcheck.h index 2ed18eb7e4..68aabf6d48 100644 --- a/contrib/libs/python/Include/intrcheck.h +++ b/contrib/libs/python/Include/intrcheck.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/intrcheck.h> -#else -#include <contrib/tools/python/src/Include/intrcheck.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/intrcheck.h> +#else +#include <contrib/tools/python/src/Include/intrcheck.h> +#endif diff --git a/contrib/libs/python/Include/iterobject.h b/contrib/libs/python/Include/iterobject.h index 489c5b1323..19b24e317a 100644 --- a/contrib/libs/python/Include/iterobject.h +++ b/contrib/libs/python/Include/iterobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/iterobject.h> -#else -#include <contrib/tools/python/src/Include/iterobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/iterobject.h> +#else +#include <contrib/tools/python/src/Include/iterobject.h> +#endif diff --git a/contrib/libs/python/Include/listobject.h b/contrib/libs/python/Include/listobject.h index d119dd9195..e16f38f988 100644 --- a/contrib/libs/python/Include/listobject.h +++ b/contrib/libs/python/Include/listobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/listobject.h> -#else -#include <contrib/tools/python/src/Include/listobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/listobject.h> +#else +#include <contrib/tools/python/src/Include/listobject.h> +#endif diff --git a/contrib/libs/python/Include/longintrepr.h b/contrib/libs/python/Include/longintrepr.h index 4c6441dad2..01a8c7a79f 100644 --- a/contrib/libs/python/Include/longintrepr.h +++ b/contrib/libs/python/Include/longintrepr.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/longintrepr.h> -#else -#include <contrib/tools/python/src/Include/longintrepr.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/longintrepr.h> +#else +#include <contrib/tools/python/src/Include/longintrepr.h> +#endif diff --git a/contrib/libs/python/Include/longobject.h b/contrib/libs/python/Include/longobject.h index a2ab1329a4..18760d63cc 100644 --- a/contrib/libs/python/Include/longobject.h +++ b/contrib/libs/python/Include/longobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/longobject.h> -#else -#include <contrib/tools/python/src/Include/longobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/longobject.h> +#else +#include <contrib/tools/python/src/Include/longobject.h> +#endif diff --git a/contrib/libs/python/Include/marshal.h b/contrib/libs/python/Include/marshal.h index cb6129fbc2..536238ca04 100644 --- a/contrib/libs/python/Include/marshal.h +++ b/contrib/libs/python/Include/marshal.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/marshal.h> -#else -#include <contrib/tools/python/src/Include/marshal.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/marshal.h> +#else +#include <contrib/tools/python/src/Include/marshal.h> +#endif diff --git a/contrib/libs/python/Include/memoryobject.h b/contrib/libs/python/Include/memoryobject.h index b332d449a3..c9941a3962 100644 --- a/contrib/libs/python/Include/memoryobject.h +++ b/contrib/libs/python/Include/memoryobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/memoryobject.h> -#else -#include <contrib/tools/python/src/Include/memoryobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/memoryobject.h> +#else +#include <contrib/tools/python/src/Include/memoryobject.h> +#endif diff --git a/contrib/libs/python/Include/metagrammar.h b/contrib/libs/python/Include/metagrammar.h index 8aa671542a..ab897e3820 100644 --- a/contrib/libs/python/Include/metagrammar.h +++ b/contrib/libs/python/Include/metagrammar.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 +#pragma once + +#ifdef USE_PYTHON3 #error "No <metagrammar.h> in Python3" -#else -#include <contrib/tools/python/src/Include/metagrammar.h> -#endif +#else +#include <contrib/tools/python/src/Include/metagrammar.h> +#endif diff --git a/contrib/libs/python/Include/methodobject.h b/contrib/libs/python/Include/methodobject.h index f0d63ca0ec..12ff79b2e2 100644 --- a/contrib/libs/python/Include/methodobject.h +++ b/contrib/libs/python/Include/methodobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/methodobject.h> -#else -#include <contrib/tools/python/src/Include/methodobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/methodobject.h> +#else +#include <contrib/tools/python/src/Include/methodobject.h> +#endif diff --git a/contrib/libs/python/Include/modsupport.h b/contrib/libs/python/Include/modsupport.h index e44e9b9c95..61dae25ba3 100644 --- a/contrib/libs/python/Include/modsupport.h +++ b/contrib/libs/python/Include/modsupport.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/modsupport.h> -#else -#include <contrib/tools/python/src/Include/modsupport.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/modsupport.h> +#else +#include <contrib/tools/python/src/Include/modsupport.h> +#endif diff --git a/contrib/libs/python/Include/moduleobject.h b/contrib/libs/python/Include/moduleobject.h index 983204866c..d138ab73ca 100644 --- a/contrib/libs/python/Include/moduleobject.h +++ b/contrib/libs/python/Include/moduleobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/moduleobject.h> -#else -#include <contrib/tools/python/src/Include/moduleobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/moduleobject.h> +#else +#include <contrib/tools/python/src/Include/moduleobject.h> +#endif diff --git a/contrib/libs/python/Include/namespaceobject.h b/contrib/libs/python/Include/namespaceobject.h index 2481dc0f66..5f4c77c8a4 100644 --- a/contrib/libs/python/Include/namespaceobject.h +++ b/contrib/libs/python/Include/namespaceobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/namespaceobject.h> -#else -#error "No <namespaceobject.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/namespaceobject.h> +#else +#error "No <namespaceobject.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/node.h b/contrib/libs/python/Include/node.h index 08fcf38b4b..0f859f8f9e 100644 --- a/contrib/libs/python/Include/node.h +++ b/contrib/libs/python/Include/node.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/node.h> -#else -#include <contrib/tools/python/src/Include/node.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/node.h> +#else +#include <contrib/tools/python/src/Include/node.h> +#endif diff --git a/contrib/libs/python/Include/object.h b/contrib/libs/python/Include/object.h index c26d54c2ff..1a7e8a96bd 100644 --- a/contrib/libs/python/Include/object.h +++ b/contrib/libs/python/Include/object.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/object.h> -#else -#include <contrib/tools/python/src/Include/object.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/object.h> +#else +#include <contrib/tools/python/src/Include/object.h> +#endif diff --git a/contrib/libs/python/Include/objimpl.h b/contrib/libs/python/Include/objimpl.h index 1ab93938d4..d33a4815a5 100644 --- a/contrib/libs/python/Include/objimpl.h +++ b/contrib/libs/python/Include/objimpl.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/objimpl.h> -#else -#include <contrib/tools/python/src/Include/objimpl.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/objimpl.h> +#else +#include <contrib/tools/python/src/Include/objimpl.h> +#endif diff --git a/contrib/libs/python/Include/odictobject.h b/contrib/libs/python/Include/odictobject.h index 01ca23838d..a3e7994c12 100644 --- a/contrib/libs/python/Include/odictobject.h +++ b/contrib/libs/python/Include/odictobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/odictobject.h> -#else -#error "No <odictobject.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/odictobject.h> +#else +#error "No <odictobject.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/opcode.h b/contrib/libs/python/Include/opcode.h index f09d32e146..add566d1ce 100644 --- a/contrib/libs/python/Include/opcode.h +++ b/contrib/libs/python/Include/opcode.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/opcode.h> -#else -#include <contrib/tools/python/src/Include/opcode.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/opcode.h> +#else +#include <contrib/tools/python/src/Include/opcode.h> +#endif diff --git a/contrib/libs/python/Include/osdefs.h b/contrib/libs/python/Include/osdefs.h index 901d1809f1..030e1cb429 100644 --- a/contrib/libs/python/Include/osdefs.h +++ b/contrib/libs/python/Include/osdefs.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/osdefs.h> -#else -#include <contrib/tools/python/src/Include/osdefs.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/osdefs.h> +#else +#include <contrib/tools/python/src/Include/osdefs.h> +#endif diff --git a/contrib/libs/python/Include/osmodule.h b/contrib/libs/python/Include/osmodule.h index d6310d29f1..0851f3d7f7 100644 --- a/contrib/libs/python/Include/osmodule.h +++ b/contrib/libs/python/Include/osmodule.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/osmodule.h> -#else -#error "No <osmodule.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/osmodule.h> +#else +#error "No <osmodule.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/parsetok.h b/contrib/libs/python/Include/parsetok.h index 6e49d9f394..5bf491e907 100644 --- a/contrib/libs/python/Include/parsetok.h +++ b/contrib/libs/python/Include/parsetok.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/parsetok.h> -#else -#include <contrib/tools/python/src/Include/parsetok.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/parsetok.h> +#else +#include <contrib/tools/python/src/Include/parsetok.h> +#endif diff --git a/contrib/libs/python/Include/patchlevel.h b/contrib/libs/python/Include/patchlevel.h index d831605341..75ce0b8f9a 100644 --- a/contrib/libs/python/Include/patchlevel.h +++ b/contrib/libs/python/Include/patchlevel.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/patchlevel.h> -#else -#include <contrib/tools/python/src/Include/patchlevel.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/patchlevel.h> +#else +#include <contrib/tools/python/src/Include/patchlevel.h> +#endif diff --git a/contrib/libs/python/Include/pgen.h b/contrib/libs/python/Include/pgen.h index 41a354cc94..b4a3a7dc8d 100644 --- a/contrib/libs/python/Include/pgen.h +++ b/contrib/libs/python/Include/pgen.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 +#pragma once + +#ifdef USE_PYTHON3 #error "No <pgen.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pgen.h> -#endif +#else +#include <contrib/tools/python/src/Include/pgen.h> +#endif diff --git a/contrib/libs/python/Include/pgenheaders.h b/contrib/libs/python/Include/pgenheaders.h index 5ff3c27b26..1f859aebad 100644 --- a/contrib/libs/python/Include/pgenheaders.h +++ b/contrib/libs/python/Include/pgenheaders.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 +#pragma once + +#ifdef USE_PYTHON3 #error "No <pgenheaders.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pgenheaders.h> -#endif +#else +#include <contrib/tools/python/src/Include/pgenheaders.h> +#endif diff --git a/contrib/libs/python/Include/py_curses.h b/contrib/libs/python/Include/py_curses.h index 1643343799..1cea7240fa 100644 --- a/contrib/libs/python/Include/py_curses.h +++ b/contrib/libs/python/Include/py_curses.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/py_curses.h> -#else -#include <contrib/tools/python/src/Include/py_curses.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/py_curses.h> +#else +#include <contrib/tools/python/src/Include/py_curses.h> +#endif diff --git a/contrib/libs/python/Include/pyarena.h b/contrib/libs/python/Include/pyarena.h index 5bbbf2b69e..79e39eba83 100644 --- a/contrib/libs/python/Include/pyarena.h +++ b/contrib/libs/python/Include/pyarena.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyarena.h> -#else -#include <contrib/tools/python/src/Include/pyarena.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyarena.h> +#else +#include <contrib/tools/python/src/Include/pyarena.h> +#endif diff --git a/contrib/libs/python/Include/pyatomic.h b/contrib/libs/python/Include/pyatomic.h index ed6243fd5f..36ea5383e2 100644 --- a/contrib/libs/python/Include/pyatomic.h +++ b/contrib/libs/python/Include/pyatomic.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyatomic.h> -#else -#error "No <pyatomic.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyatomic.h> +#else +#error "No <pyatomic.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/pycapsule.h b/contrib/libs/python/Include/pycapsule.h index 4ac52382b4..7f303ed361 100644 --- a/contrib/libs/python/Include/pycapsule.h +++ b/contrib/libs/python/Include/pycapsule.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pycapsule.h> -#else -#include <contrib/tools/python/src/Include/pycapsule.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pycapsule.h> +#else +#include <contrib/tools/python/src/Include/pycapsule.h> +#endif diff --git a/contrib/libs/python/Include/pyconfig-linux.h b/contrib/libs/python/Include/pyconfig-linux.h index d9d9df2112..de1803b710 100644 --- a/contrib/libs/python/Include/pyconfig-linux.h +++ b/contrib/libs/python/Include/pyconfig-linux.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyconfig-linux.h> -#else -#error "No <pyconfig-linux.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyconfig-linux.h> +#else +#error "No <pyconfig-linux.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/pyconfig-musl.h b/contrib/libs/python/Include/pyconfig-musl.h index 98e5dfbfd0..66e1339bac 100644 --- a/contrib/libs/python/Include/pyconfig-musl.h +++ b/contrib/libs/python/Include/pyconfig-musl.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyconfig-musl.h> -#else -#error "No <pyconfig-musl.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyconfig-musl.h> +#else +#error "No <pyconfig-musl.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/pyconfig-osx.h b/contrib/libs/python/Include/pyconfig-osx.h index c4b1b8574b..8ee6b6de2b 100644 --- a/contrib/libs/python/Include/pyconfig-osx.h +++ b/contrib/libs/python/Include/pyconfig-osx.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyconfig-osx.h> -#else -#error "No <pyconfig-osx.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyconfig-osx.h> +#else +#error "No <pyconfig-osx.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/pyconfig.cygwin.h b/contrib/libs/python/Include/pyconfig.cygwin.h index 19756b748e..930901d89b 100644 --- a/contrib/libs/python/Include/pyconfig.cygwin.h +++ b/contrib/libs/python/Include/pyconfig.cygwin.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <pyconfig.cygwin.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pyconfig.cygwin.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <pyconfig.cygwin.h> in Python3" +#else +#include <contrib/tools/python/src/Include/pyconfig.cygwin.h> +#endif diff --git a/contrib/libs/python/Include/pyconfig.darwin.h b/contrib/libs/python/Include/pyconfig.darwin.h index 0b7c6a87b5..eeb58178bf 100644 --- a/contrib/libs/python/Include/pyconfig.darwin.h +++ b/contrib/libs/python/Include/pyconfig.darwin.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <pyconfig.darwin.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pyconfig.darwin.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <pyconfig.darwin.h> in Python3" +#else +#include <contrib/tools/python/src/Include/pyconfig.darwin.h> +#endif diff --git a/contrib/libs/python/Include/pyconfig.freebsd.h b/contrib/libs/python/Include/pyconfig.freebsd.h index 0a0c30f6a6..e6d5961435 100644 --- a/contrib/libs/python/Include/pyconfig.freebsd.h +++ b/contrib/libs/python/Include/pyconfig.freebsd.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <pyconfig.freebsd.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pyconfig.freebsd.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <pyconfig.freebsd.h> in Python3" +#else +#include <contrib/tools/python/src/Include/pyconfig.freebsd.h> +#endif diff --git a/contrib/libs/python/Include/pyconfig.h b/contrib/libs/python/Include/pyconfig.h index d24d4b4535..3b13edb2ee 100644 --- a/contrib/libs/python/Include/pyconfig.h +++ b/contrib/libs/python/Include/pyconfig.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyconfig.h> -#else -#include <contrib/tools/python/src/Include/pyconfig.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyconfig.h> +#else +#include <contrib/tools/python/src/Include/pyconfig.h> +#endif diff --git a/contrib/libs/python/Include/pyconfig.ios.arm64.h b/contrib/libs/python/Include/pyconfig.ios.arm64.h index 5adb42c762..0dac2ee7ac 100644 --- a/contrib/libs/python/Include/pyconfig.ios.arm64.h +++ b/contrib/libs/python/Include/pyconfig.ios.arm64.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <pyconfig.ios.arm64.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pyconfig.ios.arm64.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <pyconfig.ios.arm64.h> in Python3" +#else +#include <contrib/tools/python/src/Include/pyconfig.ios.arm64.h> +#endif diff --git a/contrib/libs/python/Include/pyconfig.ios.armv7.h b/contrib/libs/python/Include/pyconfig.ios.armv7.h index fcbe6a71e7..ec08c5eca5 100644 --- a/contrib/libs/python/Include/pyconfig.ios.armv7.h +++ b/contrib/libs/python/Include/pyconfig.ios.armv7.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <pyconfig.ios.armv7.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pyconfig.ios.armv7.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <pyconfig.ios.armv7.h> in Python3" +#else +#include <contrib/tools/python/src/Include/pyconfig.ios.armv7.h> +#endif diff --git a/contrib/libs/python/Include/pyconfig.ios.i386.h b/contrib/libs/python/Include/pyconfig.ios.i386.h index eaba479035..98649c420f 100644 --- a/contrib/libs/python/Include/pyconfig.ios.i386.h +++ b/contrib/libs/python/Include/pyconfig.ios.i386.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <pyconfig.ios.i386.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pyconfig.ios.i386.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <pyconfig.ios.i386.h> in Python3" +#else +#include <contrib/tools/python/src/Include/pyconfig.ios.i386.h> +#endif diff --git a/contrib/libs/python/Include/pyconfig.ios.x86_64.h b/contrib/libs/python/Include/pyconfig.ios.x86_64.h index 45727828d4..dc87f0ed86 100644 --- a/contrib/libs/python/Include/pyconfig.ios.x86_64.h +++ b/contrib/libs/python/Include/pyconfig.ios.x86_64.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <pyconfig.ios.x86_64.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pyconfig.ios.x86_64.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <pyconfig.ios.x86_64.h> in Python3" +#else +#include <contrib/tools/python/src/Include/pyconfig.ios.x86_64.h> +#endif diff --git a/contrib/libs/python/Include/pyconfig.linux.h b/contrib/libs/python/Include/pyconfig.linux.h index 9d20ea3657..18ebf9c48c 100644 --- a/contrib/libs/python/Include/pyconfig.linux.h +++ b/contrib/libs/python/Include/pyconfig.linux.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <pyconfig.linux.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pyconfig.linux.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <pyconfig.linux.h> in Python3" +#else +#include <contrib/tools/python/src/Include/pyconfig.linux.h> +#endif diff --git a/contrib/libs/python/Include/pyconfig.win32.h b/contrib/libs/python/Include/pyconfig.win32.h index 3936c2b2ab..6c5c5ae32e 100644 --- a/contrib/libs/python/Include/pyconfig.win32.h +++ b/contrib/libs/python/Include/pyconfig.win32.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <pyconfig.win32.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pyconfig.win32.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <pyconfig.win32.h> in Python3" +#else +#include <contrib/tools/python/src/Include/pyconfig.win32.h> +#endif diff --git a/contrib/libs/python/Include/pyctype.h b/contrib/libs/python/Include/pyctype.h index bb5181894a..8b25c6e4ee 100644 --- a/contrib/libs/python/Include/pyctype.h +++ b/contrib/libs/python/Include/pyctype.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyctype.h> -#else -#include <contrib/tools/python/src/Include/pyctype.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyctype.h> +#else +#include <contrib/tools/python/src/Include/pyctype.h> +#endif diff --git a/contrib/libs/python/Include/pydebug.h b/contrib/libs/python/Include/pydebug.h index 29e47a4091..5619b0b907 100644 --- a/contrib/libs/python/Include/pydebug.h +++ b/contrib/libs/python/Include/pydebug.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pydebug.h> -#else -#include <contrib/tools/python/src/Include/pydebug.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pydebug.h> +#else +#include <contrib/tools/python/src/Include/pydebug.h> +#endif diff --git a/contrib/libs/python/Include/pydtrace.h b/contrib/libs/python/Include/pydtrace.h index e517c2ee4f..170d5e0ca2 100644 --- a/contrib/libs/python/Include/pydtrace.h +++ b/contrib/libs/python/Include/pydtrace.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pydtrace.h> -#else -#error "No <pydtrace.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pydtrace.h> +#else +#error "No <pydtrace.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/pyerrors.h b/contrib/libs/python/Include/pyerrors.h index fd0638e07d..587690a2b2 100644 --- a/contrib/libs/python/Include/pyerrors.h +++ b/contrib/libs/python/Include/pyerrors.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyerrors.h> -#else -#include <contrib/tools/python/src/Include/pyerrors.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyerrors.h> +#else +#include <contrib/tools/python/src/Include/pyerrors.h> +#endif diff --git a/contrib/libs/python/Include/pyexpat.h b/contrib/libs/python/Include/pyexpat.h index 5812a8fd32..e9021bf070 100644 --- a/contrib/libs/python/Include/pyexpat.h +++ b/contrib/libs/python/Include/pyexpat.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyexpat.h> -#else -#include <contrib/tools/python/src/Include/pyexpat.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyexpat.h> +#else +#include <contrib/tools/python/src/Include/pyexpat.h> +#endif diff --git a/contrib/libs/python/Include/pyfpe.h b/contrib/libs/python/Include/pyfpe.h index 41a49db7f3..b9ee7aa43f 100644 --- a/contrib/libs/python/Include/pyfpe.h +++ b/contrib/libs/python/Include/pyfpe.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyfpe.h> -#else -#include <contrib/tools/python/src/Include/pyfpe.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyfpe.h> +#else +#include <contrib/tools/python/src/Include/pyfpe.h> +#endif diff --git a/contrib/libs/python/Include/pygetopt.h b/contrib/libs/python/Include/pygetopt.h index 06ee570cd0..3e591b03ce 100644 --- a/contrib/libs/python/Include/pygetopt.h +++ b/contrib/libs/python/Include/pygetopt.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 +#pragma once + +#ifdef USE_PYTHON3 #error "No <pygetopt.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pygetopt.h> -#endif +#else +#include <contrib/tools/python/src/Include/pygetopt.h> +#endif diff --git a/contrib/libs/python/Include/pyhash.h b/contrib/libs/python/Include/pyhash.h index 7a9690a589..847428d568 100644 --- a/contrib/libs/python/Include/pyhash.h +++ b/contrib/libs/python/Include/pyhash.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyhash.h> -#else -#error "No <pyhash.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyhash.h> +#else +#error "No <pyhash.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/pylifecycle.h b/contrib/libs/python/Include/pylifecycle.h index b5f3cac8a5..7cffd7cc74 100644 --- a/contrib/libs/python/Include/pylifecycle.h +++ b/contrib/libs/python/Include/pylifecycle.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pylifecycle.h> -#else -#error "No <pylifecycle.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pylifecycle.h> +#else +#error "No <pylifecycle.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/pymacconfig.h b/contrib/libs/python/Include/pymacconfig.h index fcdddc1ca4..452a8db249 100644 --- a/contrib/libs/python/Include/pymacconfig.h +++ b/contrib/libs/python/Include/pymacconfig.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pymacconfig.h> -#else -#include <contrib/tools/python/src/Include/pymacconfig.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pymacconfig.h> +#else +#include <contrib/tools/python/src/Include/pymacconfig.h> +#endif diff --git a/contrib/libs/python/Include/pymacro.h b/contrib/libs/python/Include/pymacro.h index 0b35bdf68e..ba64609d32 100644 --- a/contrib/libs/python/Include/pymacro.h +++ b/contrib/libs/python/Include/pymacro.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pymacro.h> -#else -#error "No <pymacro.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pymacro.h> +#else +#error "No <pymacro.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/pymactoolbox.h b/contrib/libs/python/Include/pymactoolbox.h index e735deff8a..320a4920a4 100644 --- a/contrib/libs/python/Include/pymactoolbox.h +++ b/contrib/libs/python/Include/pymactoolbox.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <pymactoolbox.h> in Python3" -#else -#include <contrib/tools/python/src/Include/pymactoolbox.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <pymactoolbox.h> in Python3" +#else +#include <contrib/tools/python/src/Include/pymactoolbox.h> +#endif diff --git a/contrib/libs/python/Include/pymath.h b/contrib/libs/python/Include/pymath.h index 952b86c6e4..a83f248550 100644 --- a/contrib/libs/python/Include/pymath.h +++ b/contrib/libs/python/Include/pymath.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pymath.h> -#else -#include <contrib/tools/python/src/Include/pymath.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pymath.h> +#else +#include <contrib/tools/python/src/Include/pymath.h> +#endif diff --git a/contrib/libs/python/Include/pymem.h b/contrib/libs/python/Include/pymem.h index d17ba80627..780aa553e1 100644 --- a/contrib/libs/python/Include/pymem.h +++ b/contrib/libs/python/Include/pymem.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pymem.h> -#else -#include <contrib/tools/python/src/Include/pymem.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pymem.h> +#else +#include <contrib/tools/python/src/Include/pymem.h> +#endif diff --git a/contrib/libs/python/Include/pyport.h b/contrib/libs/python/Include/pyport.h index 9f75a32106..a32beac0c1 100644 --- a/contrib/libs/python/Include/pyport.h +++ b/contrib/libs/python/Include/pyport.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pyport.h> -#else -#include <contrib/tools/python/src/Include/pyport.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pyport.h> +#else +#include <contrib/tools/python/src/Include/pyport.h> +#endif diff --git a/contrib/libs/python/Include/pystate.h b/contrib/libs/python/Include/pystate.h index 5f1ad1d4e7..6601f2591b 100644 --- a/contrib/libs/python/Include/pystate.h +++ b/contrib/libs/python/Include/pystate.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pystate.h> -#else -#include <contrib/tools/python/src/Include/pystate.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pystate.h> +#else +#include <contrib/tools/python/src/Include/pystate.h> +#endif diff --git a/contrib/libs/python/Include/pystrcmp.h b/contrib/libs/python/Include/pystrcmp.h index 38dead26dd..748b61d534 100644 --- a/contrib/libs/python/Include/pystrcmp.h +++ b/contrib/libs/python/Include/pystrcmp.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pystrcmp.h> -#else -#include <contrib/tools/python/src/Include/pystrcmp.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pystrcmp.h> +#else +#include <contrib/tools/python/src/Include/pystrcmp.h> +#endif diff --git a/contrib/libs/python/Include/pystrhex.h b/contrib/libs/python/Include/pystrhex.h index f17fb48e45..a8a41a1b56 100644 --- a/contrib/libs/python/Include/pystrhex.h +++ b/contrib/libs/python/Include/pystrhex.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pystrhex.h> -#else -#error "No <pystrhex.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pystrhex.h> +#else +#error "No <pystrhex.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/pystrtod.h b/contrib/libs/python/Include/pystrtod.h index 7494b5abe0..70d9aa343e 100644 --- a/contrib/libs/python/Include/pystrtod.h +++ b/contrib/libs/python/Include/pystrtod.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pystrtod.h> -#else -#include <contrib/tools/python/src/Include/pystrtod.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pystrtod.h> +#else +#include <contrib/tools/python/src/Include/pystrtod.h> +#endif diff --git a/contrib/libs/python/Include/pythonrun.h b/contrib/libs/python/Include/pythonrun.h index 896d1b3978..381610c54e 100644 --- a/contrib/libs/python/Include/pythonrun.h +++ b/contrib/libs/python/Include/pythonrun.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pythonrun.h> -#else -#include <contrib/tools/python/src/Include/pythonrun.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pythonrun.h> +#else +#include <contrib/tools/python/src/Include/pythonrun.h> +#endif diff --git a/contrib/libs/python/Include/pythread.h b/contrib/libs/python/Include/pythread.h index c0107779da..3f3eae9530 100644 --- a/contrib/libs/python/Include/pythread.h +++ b/contrib/libs/python/Include/pythread.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pythread.h> -#else -#include <contrib/tools/python/src/Include/pythread.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pythread.h> +#else +#include <contrib/tools/python/src/Include/pythread.h> +#endif diff --git a/contrib/libs/python/Include/pytime.h b/contrib/libs/python/Include/pytime.h index f7e61f9e33..7412fa8632 100644 --- a/contrib/libs/python/Include/pytime.h +++ b/contrib/libs/python/Include/pytime.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/pytime.h> -#else -#error "No <pytime.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/pytime.h> +#else +#error "No <pytime.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/rangeobject.h b/contrib/libs/python/Include/rangeobject.h index 006604bb5e..dc0b4a219b 100644 --- a/contrib/libs/python/Include/rangeobject.h +++ b/contrib/libs/python/Include/rangeobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/rangeobject.h> -#else -#include <contrib/tools/python/src/Include/rangeobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/rangeobject.h> +#else +#include <contrib/tools/python/src/Include/rangeobject.h> +#endif diff --git a/contrib/libs/python/Include/setobject.h b/contrib/libs/python/Include/setobject.h index dc8288f6bc..5f09504d2b 100644 --- a/contrib/libs/python/Include/setobject.h +++ b/contrib/libs/python/Include/setobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/setobject.h> -#else -#include <contrib/tools/python/src/Include/setobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/setobject.h> +#else +#include <contrib/tools/python/src/Include/setobject.h> +#endif diff --git a/contrib/libs/python/Include/sliceobject.h b/contrib/libs/python/Include/sliceobject.h index b30a687fa1..b124a7a15b 100644 --- a/contrib/libs/python/Include/sliceobject.h +++ b/contrib/libs/python/Include/sliceobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/sliceobject.h> -#else -#include <contrib/tools/python/src/Include/sliceobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/sliceobject.h> +#else +#include <contrib/tools/python/src/Include/sliceobject.h> +#endif diff --git a/contrib/libs/python/Include/stringobject.h b/contrib/libs/python/Include/stringobject.h index e56cb06cfa..374c66667b 100644 --- a/contrib/libs/python/Include/stringobject.h +++ b/contrib/libs/python/Include/stringobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <stringobject.h> in Python3" -#else -#include <contrib/tools/python/src/Include/stringobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <stringobject.h> in Python3" +#else +#include <contrib/tools/python/src/Include/stringobject.h> +#endif diff --git a/contrib/libs/python/Include/structmember.h b/contrib/libs/python/Include/structmember.h index c030e255a3..ab8d9c2924 100644 --- a/contrib/libs/python/Include/structmember.h +++ b/contrib/libs/python/Include/structmember.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/structmember.h> -#else -#include <contrib/tools/python/src/Include/structmember.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/structmember.h> +#else +#include <contrib/tools/python/src/Include/structmember.h> +#endif diff --git a/contrib/libs/python/Include/structseq.h b/contrib/libs/python/Include/structseq.h index a04da108d2..02cadaaefe 100644 --- a/contrib/libs/python/Include/structseq.h +++ b/contrib/libs/python/Include/structseq.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/structseq.h> -#else -#include <contrib/tools/python/src/Include/structseq.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/structseq.h> +#else +#include <contrib/tools/python/src/Include/structseq.h> +#endif diff --git a/contrib/libs/python/Include/symtable.h b/contrib/libs/python/Include/symtable.h index 7ba5707165..5522056670 100644 --- a/contrib/libs/python/Include/symtable.h +++ b/contrib/libs/python/Include/symtable.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/symtable.h> -#else -#include <contrib/tools/python/src/Include/symtable.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/symtable.h> +#else +#include <contrib/tools/python/src/Include/symtable.h> +#endif diff --git a/contrib/libs/python/Include/sysmodule.h b/contrib/libs/python/Include/sysmodule.h index dcf7a9bf05..6b50a48c2d 100644 --- a/contrib/libs/python/Include/sysmodule.h +++ b/contrib/libs/python/Include/sysmodule.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/sysmodule.h> -#else -#include <contrib/tools/python/src/Include/sysmodule.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/sysmodule.h> +#else +#include <contrib/tools/python/src/Include/sysmodule.h> +#endif diff --git a/contrib/libs/python/Include/timefuncs.h b/contrib/libs/python/Include/timefuncs.h index 1b1828b17a..409ee6df19 100644 --- a/contrib/libs/python/Include/timefuncs.h +++ b/contrib/libs/python/Include/timefuncs.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#error "No <timefuncs.h> in Python3" -#else -#include <contrib/tools/python/src/Include/timefuncs.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#error "No <timefuncs.h> in Python3" +#else +#include <contrib/tools/python/src/Include/timefuncs.h> +#endif diff --git a/contrib/libs/python/Include/token.h b/contrib/libs/python/Include/token.h index de1d0dc669..cef4f27bc8 100644 --- a/contrib/libs/python/Include/token.h +++ b/contrib/libs/python/Include/token.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/token.h> -#else -#include <contrib/tools/python/src/Include/token.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/token.h> +#else +#include <contrib/tools/python/src/Include/token.h> +#endif diff --git a/contrib/libs/python/Include/traceback.h b/contrib/libs/python/Include/traceback.h index 55e6e0f98f..284fc8ab7f 100644 --- a/contrib/libs/python/Include/traceback.h +++ b/contrib/libs/python/Include/traceback.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/traceback.h> -#else -#include <contrib/tools/python/src/Include/traceback.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/traceback.h> +#else +#include <contrib/tools/python/src/Include/traceback.h> +#endif diff --git a/contrib/libs/python/Include/tupleobject.h b/contrib/libs/python/Include/tupleobject.h index acc7731d4e..8b924b9b4c 100644 --- a/contrib/libs/python/Include/tupleobject.h +++ b/contrib/libs/python/Include/tupleobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/tupleobject.h> -#else -#include <contrib/tools/python/src/Include/tupleobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/tupleobject.h> +#else +#include <contrib/tools/python/src/Include/tupleobject.h> +#endif diff --git a/contrib/libs/python/Include/typeslots.h b/contrib/libs/python/Include/typeslots.h index 1e8026e12b..4dd000ae3c 100644 --- a/contrib/libs/python/Include/typeslots.h +++ b/contrib/libs/python/Include/typeslots.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/typeslots.h> -#else -#error "No <typeslots.h> in Python2" -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/typeslots.h> +#else +#error "No <typeslots.h> in Python2" +#endif diff --git a/contrib/libs/python/Include/ucnhash.h b/contrib/libs/python/Include/ucnhash.h index d3a784f50b..42412a87b4 100644 --- a/contrib/libs/python/Include/ucnhash.h +++ b/contrib/libs/python/Include/ucnhash.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/ucnhash.h> -#else -#include <contrib/tools/python/src/Include/ucnhash.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/ucnhash.h> +#else +#include <contrib/tools/python/src/Include/ucnhash.h> +#endif diff --git a/contrib/libs/python/Include/unicodeobject.h b/contrib/libs/python/Include/unicodeobject.h index 9b531b5d2c..172af650e1 100644 --- a/contrib/libs/python/Include/unicodeobject.h +++ b/contrib/libs/python/Include/unicodeobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/unicodeobject.h> -#else -#include <contrib/tools/python/src/Include/unicodeobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/unicodeobject.h> +#else +#include <contrib/tools/python/src/Include/unicodeobject.h> +#endif diff --git a/contrib/libs/python/Include/warnings.h b/contrib/libs/python/Include/warnings.h index a2b37eba83..d5deac5bc5 100644 --- a/contrib/libs/python/Include/warnings.h +++ b/contrib/libs/python/Include/warnings.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/warnings.h> -#else -#include <contrib/tools/python/src/Include/warnings.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/warnings.h> +#else +#include <contrib/tools/python/src/Include/warnings.h> +#endif diff --git a/contrib/libs/python/Include/weakrefobject.h b/contrib/libs/python/Include/weakrefobject.h index 61f499869f..3fed3fa764 100644 --- a/contrib/libs/python/Include/weakrefobject.h +++ b/contrib/libs/python/Include/weakrefobject.h @@ -1,7 +1,7 @@ -#pragma once - -#ifdef USE_PYTHON3 -#include <contrib/tools/python3/src/Include/weakrefobject.h> -#else -#include <contrib/tools/python/src/Include/weakrefobject.h> -#endif +#pragma once + +#ifdef USE_PYTHON3 +#include <contrib/tools/python3/src/Include/weakrefobject.h> +#else +#include <contrib/tools/python/src/Include/weakrefobject.h> +#endif diff --git a/contrib/libs/python/README.md b/contrib/libs/python/README.md index 9b22a9b761..cd122b92b3 100644 --- a/contrib/libs/python/README.md +++ b/contrib/libs/python/README.md @@ -1,9 +1,9 @@ -This include-only library enables simultaneous bindings into Python2 and Python3 with single build. - -It provides the following: -- Let dependencies to headers from both Pythons be seen at once during ya make dependency computation. This makes depenency graph more stable. -- Steers build to proper Python headers depending on mode in which binding is built. -- Adds proper Python library to link. - -Headers are automatically generated from Python2 and Python3 headers using gen_includes.py script - +This include-only library enables simultaneous bindings into Python2 and Python3 with single build. + +It provides the following: +- Let dependencies to headers from both Pythons be seen at once during ya make dependency computation. This makes depenency graph more stable. +- Steers build to proper Python headers depending on mode in which binding is built. +- Adds proper Python library to link. + +Headers are automatically generated from Python2 and Python3 headers using gen_includes.py script + diff --git a/contrib/libs/python/gen_includes.py b/contrib/libs/python/gen_includes.py index bc73e6e826..0e024cc49d 100644 --- a/contrib/libs/python/gen_includes.py +++ b/contrib/libs/python/gen_includes.py @@ -1,24 +1,24 @@ -import sys -import os -import errno -from os import listdir +import sys +import os +import errno +from os import listdir from os.path import dirname, relpath, join - -def ensure_dir_exists(path): - try: - os.makedirs(path) - except OSError as e: - if e.errno == errno.EEXIST and os.path.isdir(path): - pass - else: - raise - -def make_dir(directory): - if not os.path.exists(directory): - os.makedirs(directory) - +def ensure_dir_exists(path): + try: + os.makedirs(path) + except OSError as e: + if e.errno == errno.EEXIST and os.path.isdir(path): + pass + else: + raise + + +def make_dir(directory): + if not os.path.exists(directory): + os.makedirs(directory) + def files(directory): for dirpath, dirnames, filenames in os.walk(directory): @@ -26,22 +26,22 @@ def files(directory): yield relpath(join(dirpath, name), directory) -def headers_set(directory): +def headers_set(directory): return { f for f in files(directory) if f.endswith('.h') and not f.startswith('internal/') } - -if __name__ == "__main__": - - python2_path = sys.argv[1] - python3_path = sys.argv[2] - output_path = sys.argv[3] - - ensure_dir_exists(join('.', python2_path)) - ensure_dir_exists(join('.', python3_path)) - + +if __name__ == "__main__": + + python2_path = sys.argv[1] + python3_path = sys.argv[2] + output_path = sys.argv[3] + + ensure_dir_exists(join('.', python2_path)) + ensure_dir_exists(join('.', python3_path)) + only_headers2 = headers_set(python2_path) only_headers3 = headers_set(python3_path) all_headers = only_headers2 | only_headers3 diff --git a/contrib/libs/python/ut/lib/test.cpp b/contrib/libs/python/ut/lib/test.cpp index 824b7460e1..e3aabc8889 100644 --- a/contrib/libs/python/ut/lib/test.cpp +++ b/contrib/libs/python/ut/lib/test.cpp @@ -1,21 +1,21 @@ -#include "test.h" - -#include <Python.h> +#include "test.h" + +#include <Python.h> #include <library/cpp/testing/unittest/registar.h> - -TTestPyInvoker::TTestPyInvoker() {} - -const char* TTestPyInvoker::GetVersion() { - Py_Initialize(); - - auto* module = PyImport_ImportModule("sys"); - UNIT_ASSERT(module != nullptr); - - auto* versionObj = PyObject_GetAttrString(module, "version"); - if (versionObj == nullptr) { - Py_DECREF(module); - UNIT_ASSERT(versionObj != nullptr); - } - - return Py_GetVersion(); -} + +TTestPyInvoker::TTestPyInvoker() {} + +const char* TTestPyInvoker::GetVersion() { + Py_Initialize(); + + auto* module = PyImport_ImportModule("sys"); + UNIT_ASSERT(module != nullptr); + + auto* versionObj = PyObject_GetAttrString(module, "version"); + if (versionObj == nullptr) { + Py_DECREF(module); + UNIT_ASSERT(versionObj != nullptr); + } + + return Py_GetVersion(); +} diff --git a/contrib/libs/python/ut/lib/test.h b/contrib/libs/python/ut/lib/test.h index 4bdbe672ac..1bf824ebea 100644 --- a/contrib/libs/python/ut/lib/test.h +++ b/contrib/libs/python/ut/lib/test.h @@ -1,7 +1,7 @@ -#pragma once - -class TTestPyInvoker { -public: - TTestPyInvoker(); - const char* GetVersion(); -}; +#pragma once + +class TTestPyInvoker { +public: + TTestPyInvoker(); + const char* GetVersion(); +}; diff --git a/contrib/libs/python/ut/lib/ya.make b/contrib/libs/python/ut/lib/ya.make index a67c3e254e..cfa0aaa612 100644 --- a/contrib/libs/python/ut/lib/ya.make +++ b/contrib/libs/python/ut/lib/ya.make @@ -1,17 +1,17 @@ -OWNER(spreis) - -PY23_LIBRARY() +OWNER(spreis) + +PY23_LIBRARY() WITHOUT_LICENSE_TEXTS() LICENSE(YandexOpen) -PEERDIR( +PEERDIR( library/cpp/testing/unittest -) +) SRCS( test.cpp ) -END() +END() diff --git a/contrib/libs/python/ut/py2/use.cpp b/contrib/libs/python/ut/py2/use.cpp index 853fb452dc..a4a2c8d9bb 100644 --- a/contrib/libs/python/ut/py2/use.cpp +++ b/contrib/libs/python/ut/py2/use.cpp @@ -1,10 +1,10 @@ -#include <contrib/libs/python/ut/lib/test.h> +#include <contrib/libs/python/ut/lib/test.h> #include <library/cpp/testing/unittest/registar.h> - -Y_UNIT_TEST_SUITE(TestPy3Binding) { - Y_UNIT_TEST(version) { - TTestPyInvoker invoker; - UNIT_ASSERT_EQUAL(invoker.GetVersion()[0], '2'); - } -} - + +Y_UNIT_TEST_SUITE(TestPy3Binding) { + Y_UNIT_TEST(version) { + TTestPyInvoker invoker; + UNIT_ASSERT_EQUAL(invoker.GetVersion()[0], '2'); + } +} + diff --git a/contrib/libs/python/ut/py2/ya.make b/contrib/libs/python/ut/py2/ya.make index 3962a7664e..9c5c824761 100644 --- a/contrib/libs/python/ut/py2/ya.make +++ b/contrib/libs/python/ut/py2/ya.make @@ -1,9 +1,9 @@ -OWNER(spreis) - -UNITTEST() -SRCS(use.cpp) - -PEERDIR( - contrib/libs/python/ut/lib -) -END() +OWNER(spreis) + +UNITTEST() +SRCS(use.cpp) + +PEERDIR( + contrib/libs/python/ut/lib +) +END() diff --git a/contrib/libs/python/ut/py3/use.cpp b/contrib/libs/python/ut/py3/use.cpp index e532ca89e7..8a2531bcc1 100644 --- a/contrib/libs/python/ut/py3/use.cpp +++ b/contrib/libs/python/ut/py3/use.cpp @@ -1,10 +1,10 @@ -#include <contrib/libs/python/ut/lib/test.h> +#include <contrib/libs/python/ut/lib/test.h> #include <library/cpp/testing/unittest/registar.h> - -Y_UNIT_TEST_SUITE(TestPy3Binding) { - Y_UNIT_TEST(version) { - TTestPyInvoker invoker; - UNIT_ASSERT_EQUAL(invoker.GetVersion()[0], '3'); - } -} - + +Y_UNIT_TEST_SUITE(TestPy3Binding) { + Y_UNIT_TEST(version) { + TTestPyInvoker invoker; + UNIT_ASSERT_EQUAL(invoker.GetVersion()[0], '3'); + } +} + diff --git a/contrib/libs/python/ut/py3/ya.make b/contrib/libs/python/ut/py3/ya.make index af8407938c..df6d4fe767 100644 --- a/contrib/libs/python/ut/py3/ya.make +++ b/contrib/libs/python/ut/py3/ya.make @@ -1,10 +1,10 @@ -OWNER(spreis) - -UNITTEST() -USE_PYTHON3() -SRCS(use.cpp) - -PEERDIR( - contrib/libs/python/ut/lib -) -END() +OWNER(spreis) + +UNITTEST() +USE_PYTHON3() +SRCS(use.cpp) + +PEERDIR( + contrib/libs/python/ut/lib +) +END() diff --git a/contrib/libs/python/ut/ya.make b/contrib/libs/python/ut/ya.make index 5fe3576e06..4fea35153a 100644 --- a/contrib/libs/python/ut/ya.make +++ b/contrib/libs/python/ut/ya.make @@ -1,7 +1,7 @@ -OWNER(spreis) - -RECURSE( - lib - py2 - py3 -)
\ No newline at end of file +OWNER(spreis) + +RECURSE( + lib + py2 + py3 +)
\ No newline at end of file diff --git a/contrib/libs/python/ya.make b/contrib/libs/python/ya.make index df7c89d882..20a57f4b48 100644 --- a/contrib/libs/python/ya.make +++ b/contrib/libs/python/ya.make @@ -3,16 +3,16 @@ OWNER( orivej g:contrib ) - -PY23_LIBRARY() - + +PY23_LIBRARY() + LICENSE(YandexOpen) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -NO_PYTHON_INCLUDES() - -IF (USE_ARCADIA_PYTHON) +NO_PYTHON_INCLUDES() + +IF (USE_ARCADIA_PYTHON) PEERDIR( contrib/libs/python/Include library/python/symbols/module @@ -29,21 +29,21 @@ IF (USE_ARCADIA_PYTHON) contrib/tools/python/lib library/python/runtime ) - ELSE() + ELSE() PEERDIR( contrib/tools/python3/lib library/python/runtime_py3 ) - ENDIF() -ELSE() - IF (USE_SYSTEM_PYTHON) + ENDIF() +ELSE() + IF (USE_SYSTEM_PYTHON) PEERDIR( build/platform/python ) - ELSE() - CFLAGS(GLOBAL $PYTHON_INCLUDE) - ENDIF() -ENDIF() + ELSE() + CFLAGS(GLOBAL $PYTHON_INCLUDE) + ENDIF() +ENDIF() END() diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make index ab91fc8b09..9c4640fdcf 100644 --- a/contrib/libs/ya.make +++ b/contrib/libs/ya.make @@ -285,8 +285,8 @@ RECURSE( pugixml pybind11 pycxx - python - python/ut + python + python/ut qhull quicklz r-lang |