Commit 43708c15 authored by Rich Salz's avatar Rich Salz
Browse files

Move PRIu64, OSSLzu to e_os.h 



Those macros are private, not public.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3044)
parent 9ff79fa3

e_os.h

+26 −0
Original line number Diff line number Diff line
@@ -29,6 +29,32 @@ extern "C" { 
#  endif

# endif



/*

 * We need a format operator for some client tools for uint64_t.  If inttypes.h

 * isn't available or did not define it, just go with hard-coded.

 */

# if defined(OPENSSL_SYS_UEFI)

#  define PRIu64 "Lu"

# endif

# ifndef PRIu64

#  ifdef SIXTY_FOUR_BIT_LONG

#   define PRIu64 "lu"

#  else

#   define PRIu64 "llu"

#  endif

# endif



/* Format specifier for printing size_t */

# if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)

#  define OSSLzu  "zu"

# else

#  ifdef THIRTY_TWO_BIT

#   define OSSLzu "u"

#  else

#   define OSSLzu PRIu64

#  endif

# endif



# if !defined(NDEBUG) && !defined(OPENSSL_NO_STDIO)

#  define REF_ASSERT_ISNT(test) \

    (void)((test) ? (OPENSSL_die("refcount error", __FILE__, __LINE__), 1) : 0)

include/openssl/e_os2.h

+0 −23
Original line number Diff line number Diff line
@@ -258,29 +258,6 @@ typedef unsigned __int64 uint64_t; 
#  include <stdint.h>

# endif



/*

 * We need a format operator for some client tools for uint64_t.  If inttypes.h

 * isn't available or did not define it, just go with hard-coded.

 */

# ifndef PRIu64

#  ifdef SIXTY_FOUR_BIT_LONG

#   define PRIu64 "lu"

#  else

#   define PRIu64 "llu"

#  endif

# endif



/* Format specifier for printing size_t */

# if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)

#  define OSSLzu  "zu"

# else

#  ifdef THIRTY_TWO_BIT

#   define OSSLzu "u"

#  else

#   define OSSLzu PRIu64

#  endif

# endif



/* ossl_inline: portable inline definition usable in public headers */

# if !defined(inline) && !defined(__cplusplus)

#  if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L

test/build.info

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ IF[{- !$disabled{tests} -}] 
  INCLUDE[testutil.o]=..

  INCLUDE[ssl_test_ctx.o]=../include

  INCLUDE[handshake_helper.o]=../include

  INCLUDE[ssltestlib.o]=../include

  INCLUDE[ssltestlib.o]=.. ../include



  SOURCE[x509aux]=x509aux.c

  INCLUDE[x509aux]=../include

test/ssltestlib.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <string.h>



#include "e_os.h"

#include "ssltestlib.h"



static int tls_dump_new(BIO *bi);