Make opt_imax visible in all apps

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/apps/apps.h b/apps/apps.h
index 99bcd5098a88b77ee798847ad8ef5bd1d689ce67..b6e894de39df492fa4ae54a12f2b01a78d1cdf8b 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -138,6 +138,15 @@
 #  define openssl_fdset(a,b) FD_SET(a, b)
 # endif
 
 #  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);
 /*
 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 17ac47419b70c19c938620549cb3bc7b97f69d96..14e05de023bbe9c419a0f415fda105e7bc1fc5aa 100644 (file)
--- a/apps/opt.c
+++ b/apps/opt.c
@@ -75,12 +75,6 @@ static const OPTIONS *unknown;
 static const OPTIONS *opts;
 static char prog[40];
 
 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.
  */
 /*
  * Return the simple name of the program; removing various platform gunk.
  */