diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-09-01 13:52:53 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-09-01 13:52:53 -0400 |
| commit | cbb51eb69f3faac425caae33195fdfa3396fa1c3 (patch) | |
| tree | b3c7fc2df76b1fbf2f62a6882a68cbec6131dc4f /src | |
| parent | ef585de80e29d7f20988ce06fafa58a215f6b122 (diff) | |
| download | postgresql-cbb51eb69f3faac425caae33195fdfa3396fa1c3.tar.gz postgresql-cbb51eb69f3faac425caae33195fdfa3396fa1c3.zip | |
Ensure SIZE_MAX can be used throughout our code.
Pre-C99 platforms may lack <stdint.h> and thereby SIZE_MAX. We have
a couple of places using the hack "(size_t) -1" as a fallback, but
it wasn't universally available; which means the code added in commit
2e70d6b5e fails to compile everywhere. Move that hack to c.h so that
we can rely on having SIZE_MAX everywhere.
Per discussion, it'd be a good idea to make the macro's value safe
for use in #if-tests, but that will take a bit more work. This is
just a quick expedient to get the buildfarm green again.
Back-patch to all supported branches, like the previous commit.
Discussion: https://postgr.es/m/15883.1504278595@sss.pgh.pa.us
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/c.h | 5 | ||||
| -rw-r--r-- | src/include/utils/memutils.h | 2 | ||||
| -rw-r--r-- | src/timezone/private.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/include/c.h b/src/include/c.h index 9066e3c5783..90593e55015 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -343,6 +343,11 @@ typedef unsigned PG_INT128_TYPE uint128; #define PG_INT64_MAX INT64CONST(0x7FFFFFFFFFFFFFFF) #define PG_UINT64_MAX UINT64CONST(0xFFFFFFFFFFFFFFFF) +/* Max value of size_t might also be missing if we don't have stdint.h */ +#ifndef SIZE_MAX +#define SIZE_MAX ((size_t) -1) +#endif + /* * We now always use int64 timestamps, but keep this symbol defined for the * benefit of external code that might test it. diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index c5533490668..869c59dc853 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -41,7 +41,7 @@ #define AllocSizeIsValid(size) ((Size) (size) <= MaxAllocSize) -#define MaxAllocHugeSize ((Size) -1 >> 1) /* SIZE_MAX / 2 */ +#define MaxAllocHugeSize (SIZE_MAX / 2) #define AllocHugeSizeIsValid(size) ((Size) (size) <= MaxAllocHugeSize) diff --git a/src/timezone/private.h b/src/timezone/private.h index c141fb61314..e65cd1bb4ec 100644 --- a/src/timezone/private.h +++ b/src/timezone/private.h @@ -48,10 +48,6 @@ /* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX. */ #define is_digit(c) ((unsigned)(c) - '0' <= 9) -#ifndef SIZE_MAX -#define SIZE_MAX ((size_t) -1) -#endif - /* * SunOS 4.1.1 libraries lack remove. */ |