Commit a1f04782 authored by Shane Lontis's avatar Shane Lontis
Browse files

Fix Windows Compile failure due to missing <inttypes.h> 



Including <inttypes.h> caused a windows build failure.
The test is now skipped if strtoimax & strtoumax are not supported.
It does this by checking for a define which is only available if
inttypes.h is not included. The include is done automagically inside e_os2.h.

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

test/params_conversion_test.c

+11 −4
Original line number Diff line number Diff line
@@ -9,10 +9,12 @@ 
 */



#include <string.h>

#include <inttypes.h>

#include <openssl/params.h>

#include "testutil.h"



/* On machines that dont support <inttypes.h> just disable the tests */

#if !defined(OPENSSL_NO_INTTYPES_H)



# ifdef OPENSSL_SYS_WINDOWS

#  define strcasecmp _stricmp

# endif
@@ -320,6 +322,8 @@ end: 
    return res;

}



#endif /* OPENSSL_NO_INTTYPES_H */



OPT_TEST_DECLARE_USAGE("file...\n")



int setup_tests(void)
@@ -329,6 +333,9 @@ int setup_tests(void) 
    if (n == 0)

        return 0;



#if !defined(OPENSSL_NO_INTTYPES_H)

    ADD_ALL_TESTS(run_param_file_tests, n);

#endif /* OPENSSL_NO_INTTYPES_H */



    return 1;

}