wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

e_os.h: drop now-redundant PRIu64 [and fix OSSLzu].

Browse source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3083)
This commit is contained in:
Andy Polyakov 2017-03-29 23:25:45 +02:00
parent 7d672984f4
commit 5f5840139e
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
e_os.h
View file

@ -30,29 +30,30 @@ extern "C" {
# endif # endif
/* /*
* We need a format operator for some client tools for uint64_t. If inttypes.h * Format specifier for printing size_t. Original conundrum was to
* isn't available or did not define it, just go with hard-coded. * get it working with -Wformat [-Werror], which can be considered
* overzelaous, especially in multi-platform context, but it's
* conscious choice...
*/ */
# if defined(OPENSSL_SYS_UEFI) # if defined(_WIN64)
# define PRIu64 "Lu" # define OSSLzu "I64u" /* One would expect _WIN{64|32} cases after
# endif * __STDC_VERSION__, but there are corner
# ifndef PRIu64 * cases of MinGW compilers that link with
# ifdef SIXTY_FOUR_BIT_LONG * non-compliant MSVCRT.DLL... */
# define PRIu64 "lu" # elif defined(_WIN32)
# else # define OSSLzu "u"
# define PRIu64 "llu" # elif defined(__VMS)
# endif # define OSSLzu "u" /* VMS suffers from similar problem as MinGW,
# endif * i.e. C RTL falling behind compiler. Recall
* that sizeof(size_t)==4 even in LP64 case. */
/* Format specifier for printing size_t */ # elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
# if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
# define OSSLzu "zu" # define OSSLzu "zu"
# elif defined(__SIZEOF_SIZE_T__) && __SIZEOF_SIZE_T__==4
# define OSSLzu "u" /* 'lu' should have worked, but when generating
* 32-bit code gcc still complains :-( */
# else # else
# ifdef THIRTY_TWO_BIT # define OSSLzu "lu" /* To see that is works recall what does L
# define OSSLzu "u" * stand for in ILP32 and LP64 */
# else
# define OSSLzu PRIu64
# endif
# endif # endif
# if !defined(NDEBUG) && !defined(OPENSSL_NO_STDIO) # if !defined(NDEBUG) && !defined(OPENSSL_NO_STDIO)

1
include/openssl/e_os2.h
View file

@ -236,7 +236,6 @@ typedef INT32 int32_t;
typedef UINT32 uint32_t; typedef UINT32 uint32_t;
typedef INT64 int64_t; typedef INT64 int64_t;
typedef UINT64 uint64_t; typedef UINT64 uint64_t;
# define PRIu64 "%Lu"
# elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ # elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
defined(__osf__) || defined(__sgi) || defined(__hpux) || \ defined(__osf__) || defined(__sgi) || defined(__hpux) || \
defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__) defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__)