[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  ea5e0c1caf4ea6731d09edf36a5ae57d6e60cd10 (commit)
      from  826e9e54460b30c8911f8ab28811f1961c9d63cd (commit)


- Log -----------------------------------------------------------------
commit ea5e0c1caf4ea6731d09edf36a5ae57d6e60cd10
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Fri Jan 29 17:23:03 2016 -0500

    Make opt_imax visible in all apps
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.h | 9 +++++++++
 apps/opt.c  | 6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/apps.h b/apps/apps.h
index 99bcd50..b6e894d 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 17ac474..14e05de 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.
  */