From: Nikita Popov Date: Wed, 12 Jun 2019 10:54:11 +0000 (+0200) Subject: Remove MYSQLND_LLU_SPEC/MYSQLND_LL_SPEC X-Git-Tag: php-7.4.0alpha2~131 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52d80ccd2401b3b67be08f7e584f04ca1174462e;p=php Remove MYSQLND_LLU_SPEC/MYSQLND_LL_SPEC No longer used, replaced by PRIu64/PRIi64. --- diff --git a/ext/mysqlnd/mysqlnd_portability.h b/ext/mysqlnd/mysqlnd_portability.h index 7736ae9fa8..622e31dcd4 100644 --- a/ext/mysqlnd/mysqlnd_portability.h +++ b/ext/mysqlnd/mysqlnd_portability.h @@ -56,71 +56,12 @@ This file is public domain and comes with NO WARRANTY of any kind */ #endif #ifdef PHP_WIN32 -#define MYSQLND_LLU_SPEC "%I64u" -#define MYSQLND_LL_SPEC "%I64d" #define MYSQLND_SZ_T_SPEC "%Id" #ifndef L64 #define L64(x) x##i64 #endif #else -#if __i386__ -#define MYSQLND_LL_SPEC "%lli" -#define MYSQLND_LLU_SPEC "%llu" -#endif - -#if __ia64__ -#define MYSQLND_LL_SPEC "%li" -#define MYSQLND_LLU_SPEC "%lu" -#endif - -#if __powerpc64__ || __ppc64__ -#define MYSQLND_LL_SPEC "%li" -#define MYSQLND_LLU_SPEC "%lu" -#endif - -#if (__powerpc__ || __ppc__ ) && !(__powerpc64__ || __ppc64__) -#define MYSQLND_LL_SPEC "%lli" -#define MYSQLND_LLU_SPEC "%llu" -#endif - -#if __x86_64__ -#define MYSQLND_LL_SPEC "%li" -#define MYSQLND_LLU_SPEC "%lu" -#endif - -#if __s390x__ -#define MYSQLND_LL_SPEC "%li" -#define MYSQLND_LLU_SPEC "%lu" -#endif - -#if __s390__ && !__s390x__ -#define MYSQLND_LL_SPEC "%lli" -#define MYSQLND_LLU_SPEC "%llu" -#endif - -#ifdef _AIX -#define MYSQLND_LL_SPEC "%lli" -#define MYSQLND_LLU_SPEC "%llu" -#endif - -#ifndef MYSQLND_LL_SPEC - #if SIZEOF_LONG == 8 - #define MYSQLND_LL_SPEC "%li" - #elif SIZEOF_LONG == 4 - #define MYSQLND_LL_SPEC "%lli" - #endif -#endif - -#ifndef MYSQLND_LLU_SPEC - #if SIZEOF_LONG == 8 - #define MYSQLND_LLU_SPEC "%lu" - #elif SIZEOF_LONG == 4 - #define MYSQLND_LLU_SPEC "%llu" - #endif -#endif /* MYSQLND_LLU_SPEC*/ - - #define MYSQLND_SZ_T_SPEC "%zd" #ifndef L64 #define L64(x) x##LL