diff options
| author | Tom Lane | 2017-09-01 17:52:54 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-09-01 17:52:54 +0000 |
| commit | 9a98557662a9a2c58483f7415f79551194c19edb (patch) | |
| tree | 7d0fac457067e2cf154be831c2b72b5133c04fb1 | |
| parent | 2338ad26374ef27c7601bb5a1517a6a0c82ef94e (diff) | |
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
| -rw-r--r-- | src/include/c.h | 4 | ||||
| -rw-r--r-- | src/include/utils/memutils.h | 2 | ||||
| -rw-r--r-- | src/timezone/private.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/include/c.h b/src/include/c.h index 2b5d84e53f1..fad895204b7 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -288,6 +288,10 @@ typedef unsigned long long int uint64; #define UINT64CONST(x) ((uint64) x) #endif +/* Max value of size_t might be missing if we don't have stdint.h */ +#ifndef SIZE_MAX +#define SIZE_MAX ((size_t) -1) +#endif /* Select timestamp representation (float8 or int64) */ #ifdef USE_INTEGER_DATETIMES diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index 9f499d11804..a0c755daf37 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 f031b17b7ef..f78053660e8 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. */ |