diff options
| author | thegeorg <thegeorg@yandex-team.ru> | 2022-03-20 18:18:47 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.ru> | 2022-03-20 18:18:47 +0300 |
| commit | e7aae615944a704e320aaea56e0cebfa2dcf2959 (patch) | |
| tree | b4344342333eba39cd91d76d364dea8b23d1fe51 /util | |
| parent | 5ce3a9912f6b93afbdd0bb3ae96aed39aa616340 (diff) | |
| download | ydb-e7aae615944a704e320aaea56e0cebfa2dcf2959.tar.gz | |
util: Do not define SIZEOF_SIZE_T, as it is not used in our codebase
codesearch shows [114 usages](https://a.yandex-team.ru/search?search=%5CbSIZEOF_SIZE_T%5Cb,,jC,arcadia,,500) of this macro outside of contrib.
None of these usages looks as being util-dependent.
Defining this in util triggers `-Wmacro-redefined` whenever `` gets included after our ``.
UPD:
It turns out that our curl was using this define for a reason,
so I have implemented an util-independent solution instead.
ref:c80e45c42a9c0ec76eda33e63b560b285e1ee502
Diffstat (limited to 'util')
| -rw-r--r-- | util/system/platform.h | 5 | ||||
| -rw-r--r-- | util/system/platform_ut.cpp | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/util/system/platform.h b/util/system/platform.h index 58f310ab34..b085cf5b1b 100644 --- a/util/system/platform.h +++ b/util/system/platform.h @@ -87,7 +87,7 @@ * Microsoft can define _M_IX86, _M_AMD64 (before Visual Studio 8) * or _M_X64 (starting in Visual Studio 8). */ -#if defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) +#if defined(__x86_64__) || defined(_M_X64) #define _x86_64_ #endif @@ -240,7 +240,4 @@ #define SIZEOF_LONG_LONG 8 #define SIZEOF_UNSIGNED_LONG_LONG 8 -#undef SIZEOF_SIZE_T // in case we include <Python.h> which defines it, too -#define SIZEOF_SIZE_T SIZEOF_PTR - // clang-format on diff --git a/util/system/platform_ut.cpp b/util/system/platform_ut.cpp index 9bfbce8315..559a6219aa 100644 --- a/util/system/platform_ut.cpp +++ b/util/system/platform_ut.cpp @@ -15,7 +15,6 @@ private: UNIT_ASSERT_EQUAL(SIZEOF_INT, sizeof(int)); UNIT_ASSERT_EQUAL(SIZEOF_LONG, sizeof(long)); UNIT_ASSERT_EQUAL(SIZEOF_LONG_LONG, sizeof(long long)); - UNIT_ASSERT_EQUAL(SIZEOF_SIZE_T, sizeof(size_t)); UNIT_ASSERT_EQUAL(SIZEOF_UNSIGNED_CHAR, sizeof(unsigned char)); UNIT_ASSERT_EQUAL(SIZEOF_UNSIGNED_INT, sizeof(unsigned int)); UNIT_ASSERT_EQUAL(SIZEOF_UNSIGNED_LONG, sizeof(unsigned long)); |