Commit 53f54696 authored Jun 11, 2019 by Shane Lontis

Fix app opt compile failure due to missing <inttypes.h>



opt.c uses functions that are only available if inttypes.h exists.
It now checks a define which is unavailable if
inttypes.h is included. The include is done automagically inside e_os2.h.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8986)

parent a1f04782

apps/include/opt.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -317,7 +317,8 @@ int opt_int(const char arg, int result);
	int opt_ulong(const char arg, unsigned long result);		int opt_ulong(const char arg, unsigned long result);
	int opt_long(const char arg, long result);		int opt_long(const char arg, long result);
	#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \		#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
	defined(INTMAX_MAX) && defined(UINTMAX_MAX)		defined(INTMAX_MAX) && defined(UINTMAX_MAX) && \
			!defined(OPENSSL_NO_INTTYPES_H)
	int opt_imax(const char arg, intmax_t result);		int opt_imax(const char arg, intmax_t result);
	int opt_umax(const char arg, uintmax_t result);		int opt_umax(const char arg, uintmax_t result);
	#else		#else

apps/opt.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -377,7 +377,8 @@ int opt_long(const char value, long result)
	}		}

	#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \		#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
	defined(INTMAX_MAX) && defined(UINTMAX_MAX)		defined(INTMAX_MAX) && defined(UINTMAX_MAX) && \
			!defined(OPENSSL_NO_INTTYPES_H)

	/* Parse an intmax_t, put it into result; return 0 on failure, else 1. /		/* Parse an intmax_t, put it into result; return 0 on failure, else 1. /
	int opt_imax(const char value, intmax_t result)		int opt_imax(const char value, intmax_t result)