diff options
| author | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-01-29 23:23:03 +0100 |
|---|---|---|
| committer | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-01-30 00:46:55 +0100 |
| commit | ea5e0c1caf4ea6731d09edf36a5ae57d6e60cd10 (patch) | |
| tree | 2c1dd6b185d0b5842d98dd39de44de573b6894e4 /apps | |
| parent | Missed rc2_int from before. (diff) | |
| download | openssl-ea5e0c1caf4ea6731d09edf36a5ae57d6e60cd10.tar.xz openssl-ea5e0c1caf4ea6731d09edf36a5ae57d6e60cd10.zip | |
Make opt_imax visible in all apps
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.h | 9 | ||||
| -rw-r--r-- | apps/opt.c | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/apps/apps.h b/apps/apps.h index 99bcd5098a..b6e894de39 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -138,6 +138,15 @@ # define openssl_fdset(a,b) FD_SET(a, b) # endif +# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \ + defined(INTMAX_MAX) && defined(UINTMAX_MAX) +int opt_imax(const char *value, intmax_t *result); +int opt_umax(const char *value, uintmax_t *result); +# else +# define opt_imax opt_long +# define opt_umax opt_ulong +# endif + int app_RAND_load_file(const char *file, int dont_warn); int app_RAND_write_file(const char *file); /* diff --git a/apps/opt.c b/apps/opt.c index 17ac47419b..14e05de023 100644 --- a/apps/opt.c +++ b/apps/opt.c @@ -75,12 +75,6 @@ static const OPTIONS *unknown; static const OPTIONS *opts; static char prog[40]; -#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L || \ - !defined(INTMAX_MAX) && !defined(UINTMAX_MAX) -#define opt_imax opt_long -#define opt_umax opt_ulong -#endif - /* * Return the simple name of the program; removing various platform gunk. */ |