mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-19 19:50:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove OSSLzu, and fix the one place that used it.

Browse Source 
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5439)
This commit is contained in:
Rich Salz 2018-02-23 16:49:59 -05:00
parent 604e591ed7
commit 77376c0507
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
e_os.h
View File

@ -26,33 +26,6 @@
extern "C" {
#endif
/*
* Format specifier for printing size_t. Original conundrum was to
* get it working with -Wformat [-Werror], which can be considered
* overzealous, especially in multi-platform context, but it's
* conscious choice...
*/
# if defined(_WIN64)
# define OSSLzu "I64u" /* One would expect _WIN{64|32} cases after
* __STDC_VERSION__, but there are corner
* cases of MinGW compilers that link with
* non-compliant MSVCRT.DLL... */
# elif defined(_WIN32)
# define OSSLzu "u"
# elif defined(__VMS)
# define OSSLzu "u" /* VMS suffers from similar problem as MinGW,
* i.e. C RTL falling behind compiler. Recall
* that sizeof(size_t)==4 even in LP64 case. */
# elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
# 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
# define OSSLzu "lu" /* To see that is works recall what does L
* stand for in ILP32 and LP64 */
# endif
# ifndef DEVRANDOM
/*
* set this to a comma-separated list of 'random' device files to try out. By

2
ssl/record/ssl3_record.c
View File

@ -550,7 +550,7 @@ int ssl3_get_record(SSL *s)
return -1;
}
#ifdef SSL_DEBUG
printf("dec %"OSSLzu"\n", rr[0].length);
printf("dec %lu\n", (unsigned long)rr[0].length);
{
size_t z;
for (z = 0; z < rr[0].length; z++)