aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/tools
diff options
context:
space:
mode:
authormelkov <melkov@yandex-team.ru>2022-02-10 16:48:14 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:48:14 +0300
commit2c532b38e6aeb4fd88531027c7335690fd34c4e5 (patch)
treeb222e5ac2e2e98872661c51ccceee5da0d291e13 /contrib/tools
parent438546c8737d5c1fdeb31157dcf999717d930eec (diff)
downloadydb-2c532b38e6aeb4fd88531027c7335690fd34c4e5.tar.gz
Restoring authorship annotation for <melkov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib/tools')
-rw-r--r--contrib/tools/bison/gnulib/platform/win64/config.h2
-rw-r--r--contrib/tools/bison/gnulib/platform/win64/math.h2
-rw-r--r--contrib/tools/bison/m4/src/m4.c10
-rw-r--r--contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp20
-rw-r--r--contrib/tools/python/pyconfig.inc4
-rw-r--r--contrib/tools/python/src/config_init.c2
-rw-r--r--contrib/tools/python/src/config_map.c2
7 files changed, 21 insertions, 21 deletions
diff --git a/contrib/tools/bison/gnulib/platform/win64/config.h b/contrib/tools/bison/gnulib/platform/win64/config.h
index 316f866ca1..cf3d366e18 100644
--- a/contrib/tools/bison/gnulib/platform/win64/config.h
+++ b/contrib/tools/bison/gnulib/platform/win64/config.h
@@ -964,7 +964,7 @@
/* Define to 1 if you have the `strsignal' function. */
/* #undef HAVE_STRSIGNAL */
-char *strsignal (int signum);
+char *strsignal (int signum);
/* Define to 1 if `decimal_point' is a member of `struct lconv'. */
#define HAVE_STRUCT_LCONV_DECIMAL_POINT 1
diff --git a/contrib/tools/bison/gnulib/platform/win64/math.h b/contrib/tools/bison/gnulib/platform/win64/math.h
index a37cb0c3e6..b2a0023d11 100644
--- a/contrib/tools/bison/gnulib/platform/win64/math.h
+++ b/contrib/tools/bison/gnulib/platform/win64/math.h
@@ -33,7 +33,7 @@
#ifndef _GL_M4_MATH_H
#define _GL_M4_MATH_H
-#if _MSC_VER >= 1800 // [
+#if _MSC_VER >= 1800 // [
#else // ] _MSC_VER >= 1600 [
#ifndef _GL_INLINE_HEADER_BEGIN
diff --git a/contrib/tools/bison/m4/src/m4.c b/contrib/tools/bison/m4/src/m4.c
index 78b830916b..2c03154471 100644
--- a/contrib/tools/bison/m4/src/m4.c
+++ b/contrib/tools/bison/m4/src/m4.c
@@ -364,9 +364,9 @@ process_file (const char *name)
int
main (int argc, char *const *argv)
{
-#if !defined(_WIN32) && !defined(_WIN64)
+#if !defined(_WIN32) && !defined(_WIN64)
struct sigaction act;
-#endif
+#endif
macro_definition *head; /* head of deferred argument list */
macro_definition *tail;
macro_definition *defn;
@@ -402,9 +402,9 @@ main (int argc, char *const *argv)
signal_message[SIGFPE] = xstrdup (strsignal (SIGFPE));
if (SIGBUS != SIGILL && SIGBUS != SIGSEGV)
signal_message[SIGBUS] = xstrdup (strsignal (SIGBUS));
-#if !defined(_WIN32) && !defined(_WIN64)
- // No such signals on Windows
- sigemptyset(&act.sa_mask);
+#if !defined(_WIN32) && !defined(_WIN64)
+ // No such signals on Windows
+ sigemptyset(&act.sa_mask);
/* One-shot - if we fault while handling a fault, we want to revert
to default signal behavior. */
act.sa_flags = SA_NODEFER | SA_RESETHAND;
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp b/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
index d5816b6bce..cd96aa0565 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
@@ -213,11 +213,11 @@ namespace NPlugins {
"inline $type$* Add$rname$() { return add_$name$(); }\n"
"inline const $type$& get_idx_$name$(int _index) const { return $name$(_index); }\n"
"inline const ::google::protobuf::RepeatedPtrField< $type$ >&\n"
- " get_arr_$name$() const { return $name$(); }\n"
+ " get_arr_$name$() const { return $name$(); }\n"
"inline const ::google::protobuf::RepeatedPtrField< $type$ >&\n"
- " Get$rname$() const { return $name$(); }\n"
+ " Get$rname$() const { return $name$(); }\n"
"inline ::google::protobuf::RepeatedPtrField< $type$ >*\n"
- " Mutable$rname$() { return mutable_$name$(); }\n");
+ " Mutable$rname$() { return mutable_$name$(); }\n");
if (Variables_.end() != Variables_.find("RName"))
printer->Print(Variables_,
@@ -225,9 +225,9 @@ namespace NPlugins {
"inline $type$* Mutable$RName$(size_t _index) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return mutable_$name$(int(_index)); }\n"
"inline $type$* Add$RName$() { return add_$name$(); }\n"
"inline const ::google::protobuf::RepeatedPtrField< $type$ >&\n"
- " Get$RName$() const { return $name$(); }\n"
+ " Get$RName$() const { return $name$(); }\n"
"inline ::google::protobuf::RepeatedPtrField< $type$ >*\n"
- " Mutable$RName$() { return mutable_$name$(); }\n"
+ " Mutable$RName$() { return mutable_$name$(); }\n"
);
}
@@ -457,20 +457,20 @@ namespace NPlugins {
"inline void Add$rname$($type$ value) { add_$name$(value); }\n"
"inline $type$ get_idx_$name$(int _index) const { return $name$(_index); }\n"
"inline const ::google::protobuf::RepeatedField< $type$ >&\n"
- " get_arr_$name$() const { return $name$(); }\n"
+ " get_arr_$name$() const { return $name$(); }\n"
"inline const ::google::protobuf::RepeatedField< $type$ >&\n"
- " Get$rname$() const { return $name$(); }\n"
+ " Get$rname$() const { return $name$(); }\n"
"inline ::google::protobuf::RepeatedField< $type$ >*\n"
- " Mutable$rname$() { return mutable_$name$(); }\n");
+ " Mutable$rname$() { return mutable_$name$(); }\n");
if (Variables_.end() != Variables_.find("RName"))
printer->Print(Variables_,
"inline $type$ Get$RName$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n"
"inline void Set$RName$(size_t _index, $type$ value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n"
"inline void Add$RName$($type$ value) { add_$name$(value); }\n"
"inline const ::google::protobuf::RepeatedField< $type$ >&\n"
- " Get$RName$() const { return $name$(); }\n"
+ " Get$RName$() const { return $name$(); }\n"
"inline ::google::protobuf::RepeatedField< $type$ >*\n"
- " Mutable$RName$() { return mutable_$name$(); }\n"
+ " Mutable$RName$() { return mutable_$name$(); }\n"
);
}
diff --git a/contrib/tools/python/pyconfig.inc b/contrib/tools/python/pyconfig.inc
index c07dab5d5e..01da7d4566 100644
--- a/contrib/tools/python/pyconfig.inc
+++ b/contrib/tools/python/pyconfig.inc
@@ -17,10 +17,10 @@ CFLAGS(
)
IF (NOT WIN32)
- EXTRALIBS(-lutil)
+ EXTRALIBS(-lutil)
IF (LINUX)
- EXTRALIBS(-ldl)
+ EXTRALIBS(-ldl)
CFLAGS(
-DUNQUOTED_PYTHONPATH=:plat-linux2
diff --git a/contrib/tools/python/src/config_init.c b/contrib/tools/python/src/config_init.c
index 91f4d970b3..2fa47000b8 100644
--- a/contrib/tools/python/src/config_init.c
+++ b/contrib/tools/python/src/config_init.c
@@ -84,7 +84,7 @@ extern void initpyexpat(void);
extern void initselect(void);
extern void initmsvcrt(void);
extern void init_subprocess(void);
-extern void init_winreg(void);
+extern void init_winreg(void);
#endif
#if !defined(_CYGWIN_)
diff --git a/contrib/tools/python/src/config_map.c b/contrib/tools/python/src/config_map.c
index 9e1869bd08..6bfe125ddd 100644
--- a/contrib/tools/python/src/config_map.c
+++ b/contrib/tools/python/src/config_map.c
@@ -84,7 +84,7 @@
{"select", initselect},
{"msvcrt", initmsvcrt},
{"_subprocess", init_subprocess},
-{"_winreg", init_winreg},
+{"_winreg", init_winreg},
#endif
#if defined(_x86_) && !defined(_CYGWIN_) || defined(__powerpc__) || defined(__aarch64__)