diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/c.h | 29 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 26 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/data.c | 5 | ||||
| -rw-r--r-- | src/timezone/private.h | 4 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 8 |
5 files changed, 1 insertions, 71 deletions
diff --git a/src/include/c.h b/src/include/c.h index d35405f191a..8c4baeb0ec3 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -1294,35 +1294,6 @@ typedef union PGAlignedXLogBlock extern int fdatasync(int fildes); #endif -/* Older platforms may provide strto[u]ll functionality under other names */ -#if !defined(HAVE_STRTOLL) && defined(HAVE___STRTOLL) -#define strtoll __strtoll -#define HAVE_STRTOLL 1 -#endif - -#if !defined(HAVE_STRTOLL) && defined(HAVE_STRTOQ) -#define strtoll strtoq -#define HAVE_STRTOLL 1 -#endif - -#if !defined(HAVE_STRTOULL) && defined(HAVE___STRTOULL) -#define strtoull __strtoull -#define HAVE_STRTOULL 1 -#endif - -#if !defined(HAVE_STRTOULL) && defined(HAVE_STRTOUQ) -#define strtoull strtouq -#define HAVE_STRTOULL 1 -#endif - -#if defined(HAVE_STRTOLL) && !HAVE_DECL_STRTOLL -extern long long strtoll(const char *str, char **endptr, int base); -#endif - -#if defined(HAVE_STRTOULL) && !HAVE_DECL_STRTOULL -extern unsigned long long strtoull(const char *str, char **endptr, int base); -#endif - /* * Thin wrappers that convert strings to exactly 64-bit integers, matching our * definition of int64. (For the naming, compare that POSIX has diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 2a0d08d10f5..b584788dc08 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -150,14 +150,6 @@ don't. */ #undef HAVE_DECL_STRNLEN -/* Define to 1 if you have the declaration of `strtoll', and to 0 if you - don't. */ -#undef HAVE_DECL_STRTOLL - -/* Define to 1 if you have the declaration of `strtoull', and to 0 if you - don't. */ -#undef HAVE_DECL_STRTOULL - /* Define to 1 if you have the <editline/history.h> header file. */ #undef HAVE_EDITLINE_HISTORY_H @@ -481,18 +473,6 @@ /* Define to 1 if you have the `strtof' function. */ #undef HAVE_STRTOF -/* Define to 1 if you have the `strtoll' function. */ -#undef HAVE_STRTOLL - -/* Define to 1 if you have the `strtoq' function. */ -#undef HAVE_STRTOQ - -/* Define to 1 if you have the `strtoull' function. */ -#undef HAVE_STRTOULL - -/* Define to 1 if you have the `strtouq' function. */ -#undef HAVE_STRTOUQ - /* Define to 1 if the system has the type `struct addrinfo'. */ #undef HAVE_STRUCT_ADDRINFO @@ -688,12 +668,6 @@ /* Define to 1 if your compiler understands _Static_assert. */ #undef HAVE__STATIC_ASSERT -/* Define to 1 if you have the `__strtoll' function. */ -#undef HAVE___STRTOLL - -/* Define to 1 if you have the `__strtoull' function. */ -#undef HAVE___STRTOULL - /* Define to the appropriate printf length modifier for 64-bit ints. */ #undef INT64_MODIFIER diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c index a1bba42bb8f..bf9b313a114 100644 --- a/src/interfaces/ecpg/ecpglib/data.c +++ b/src/interfaces/ecpg/ecpglib/data.c @@ -438,7 +438,6 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, } break; -#ifdef HAVE_STRTOLL case ECPGt_long_long: *((long long int *) (var + offset * act_tuple)) = strtoll(pval, &scan_length, 10); if (garbage_left(isarray, &scan_length, compat)) @@ -449,8 +448,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, pval = scan_length; break; -#endif /* HAVE_STRTOLL */ -#ifdef HAVE_STRTOULL + case ECPGt_unsigned_long_long: *((unsigned long long int *) (var + offset * act_tuple)) = strtoull(pval, &scan_length, 10); if (garbage_left(isarray, &scan_length, compat)) @@ -461,7 +459,6 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, pval = scan_length; break; -#endif /* HAVE_STRTOULL */ case ECPGt_float: case ECPGt_double: diff --git a/src/timezone/private.h b/src/timezone/private.h index 533e3d9f4ed..39d40e43a9f 100644 --- a/src/timezone/private.h +++ b/src/timezone/private.h @@ -46,11 +46,7 @@ /* PG doesn't currently rely on <inttypes.h>, so work around strtoimax() */ #undef strtoimax -#ifdef HAVE_STRTOLL #define strtoimax strtoll -#else -#define strtoimax strtol -#endif /* diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index d7ab6ab2587..9fe53bb036e 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -246,8 +246,6 @@ sub GenerateFiles HAVE_DECL_STRLCAT => 0, HAVE_DECL_STRLCPY => 0, HAVE_DECL_STRNLEN => 1, - HAVE_DECL_STRTOLL => 1, - HAVE_DECL_STRTOULL => 1, HAVE_EDITLINE_HISTORY_H => undef, HAVE_EDITLINE_READLINE_H => undef, HAVE_EXECINFO_H => undef, @@ -354,10 +352,6 @@ sub GenerateFiles HAVE_STRNLEN => 1, HAVE_STRSIGNAL => undef, HAVE_STRTOF => 1, - HAVE_STRTOLL => 1, - HAVE_STRTOQ => undef, - HAVE_STRTOULL => 1, - HAVE_STRTOUQ => undef, HAVE_STRUCT_ADDRINFO => 1, HAVE_STRUCT_CMSGCRED => undef, HAVE_STRUCT_OPTION => undef, @@ -423,8 +417,6 @@ sub GenerateFiles HAVE__CPUID => 1, HAVE__GET_CPUID => undef, HAVE__STATIC_ASSERT => undef, - HAVE___STRTOLL => undef, - HAVE___STRTOULL => undef, INT64_MODIFIER => qq{"ll"}, LOCALE_T_IN_XLOCALE => undef, MAXIMUM_ALIGNOF => 8, |