aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrj42 <rj42@yandex-team.ru>2022-02-10 16:47:47 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:47:47 +0300
commit0148ac5e2009a411becc605faa1e6a8801535649 (patch)
treec0748b5dcbade83af788c0abfa89c0383d6b779c
parent31ae884bd618988fabdd0b7cb7605bd187fda479 (diff)
downloadydb-0148ac5e2009a411becc605faa1e6a8801535649.tar.gz
Restoring authorship annotation for <rj42@yandex-team.ru>. Commit 2 of 2.
-rw-r--r--contrib/libs/libiconv/config.h2
-rw-r--r--contrib/libs/libiconv/converters.h4
-rw-r--r--contrib/libs/libiconv/encodings.def2
-rw-r--r--contrib/libs/libiconv/iconv.c6
-rw-r--r--library/cpp/ya.make2
-rw-r--r--tools/archiver/main.cpp2
6 files changed, 9 insertions, 9 deletions
diff --git a/contrib/libs/libiconv/config.h b/contrib/libs/libiconv/config.h
index 60858691d8..4ff0f69480 100644
--- a/contrib/libs/libiconv/config.h
+++ b/contrib/libs/libiconv/config.h
@@ -19,7 +19,7 @@
/* Define to 1 to enable a few rarely used encodings. */
-#define ENABLE_EXTRA !defined(ARCADIA_ICONV_NOCJK)
+#define ENABLE_EXTRA !defined(ARCADIA_ICONV_NOCJK)
/* Define to 1 if the package shall run at any location in the filesystem. */
/* #undef ENABLE_RELOCATABLE */
diff --git a/contrib/libs/libiconv/converters.h b/contrib/libs/libiconv/converters.h
index d8cddb2e5d..c67fa08bf8 100644
--- a/contrib/libs/libiconv/converters.h
+++ b/contrib/libs/libiconv/converters.h
@@ -199,7 +199,7 @@ struct conv_struct {
/* CJK character sets [CCS = coded character set] [CJKV.INF chapter 3] */
-#ifndef ARCADIA_ICONV_NOCJK
+#ifndef ARCADIA_ICONV_NOCJK
typedef struct {
unsigned short indx; /* index into big table */
unsigned short used; /* bitmask of used entries */
@@ -225,7 +225,7 @@ typedef struct {
/* CJK encodings [CES = character encoding scheme] [CJKV.INF chapter 4] */
-#ifndef ARCADIA_ICONV_NOCJK
+#ifndef ARCADIA_ICONV_NOCJK
#include "euc_jp.h"
#include "sjis.h"
#include "cp932.h"
diff --git a/contrib/libs/libiconv/encodings.def b/contrib/libs/libiconv/encodings.def
index 709c3ca69d..d5c739a26a 100644
--- a/contrib/libs/libiconv/encodings.def
+++ b/contrib/libs/libiconv/encodings.def
@@ -725,7 +725,7 @@ DEFENCODING(( "TCVN",
/* CJK character sets (not documented) */
-#ifndef ARCADIA_ICONV_NOCJK
+#ifndef ARCADIA_ICONV_NOCJK
DEFENCODING(( "JIS_C6220-1969-RO", /* IANA */
"ISO646-JP", /* IANA */
"ISO-IR-14", /* IANA */
diff --git a/contrib/libs/libiconv/iconv.c b/contrib/libs/libiconv/iconv.c
index 3efb32a6bf..69f70c2f8e 100644
--- a/contrib/libs/libiconv/iconv.c
+++ b/contrib/libs/libiconv/iconv.c
@@ -146,7 +146,7 @@ static struct encoding const all_encodings[] = {
# include "aliases_sysosf1.h"
#elif defined __sun
# include "aliases_syssolaris.h"
-#elif defined(ARCADIA_ICONV_NOCJK)
+#elif defined(ARCADIA_ICONV_NOCJK)
# include "aliases_nocjk.h"
#else
# include "aliases.h"
@@ -443,7 +443,7 @@ static const unsigned short all_canonical[] = {
# include "canonical_sysosf1.h"
#elif defined __sun
# include "canonical_syssolaris.h"
-#elif defined(ARCADIA_ICONV_NOCJK)
+#elif defined(ARCADIA_ICONV_NOCJK)
# include "canonical_nocjk.h"
#else
# include "canonical.h"
@@ -476,7 +476,7 @@ static const unsigned short all_canonical[] = {
# include "canonical_local_sysosf1.h"
#elif defined __sun
# include "canonical_local_syssolaris.h"
-#elif defined(ARCADIA_ICONV_NOCJK)
+#elif defined(ARCADIA_ICONV_NOCJK)
# include "canonical_local_nocjk.h"
#else
# include "canonical_local.h"
diff --git a/library/cpp/ya.make b/library/cpp/ya.make
index 5293e33cad..8c1193b007 100644
--- a/library/cpp/ya.make
+++ b/library/cpp/ya.make
@@ -368,7 +368,7 @@ RECURSE(
tld
tld/ut
token
- token/lite
+ token/lite
token/serialization
token/serialization/ut
token/ut
diff --git a/tools/archiver/main.cpp b/tools/archiver/main.cpp
index 6cd845d1fa..6cda54c1ea 100644
--- a/tools/archiver/main.cpp
+++ b/tools/archiver/main.cpp
@@ -609,7 +609,7 @@ int main(int argc, char** argv) {
StringSplitter(forceKeys).Split(':').SkipEmpty().Collect(&keys);
if (keys.size() && keys.size() != files.size()) {
- Cerr << "Invalid number of keys=" << keys.size() << " (!= number of files=" << files.size() << ")" << Endl;
+ Cerr << "Invalid number of keys=" << keys.size() << " (!= number of files=" << files.size() << ")" << Endl;
return 1;
}