Change RC5_32_set_key to return an int type

[openssl.git] / apps / win32_init.c

diff --git a/apps/win32_init.c b/apps/win32_init.c
index 259e3f35ba05b1eaf7b26fdd5749743080a66a46..8836b3ba3913a059d7bf380c5a83af4ff22bea14 100644 (file)
--- a/apps/win32_init.c
+++ b/apps/win32_init.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -145,6 +145,9 @@ void win32_utf8argv(int *argc, char **argv[])
     int wlen, ulen, valid = 1;
     char *arg;
 
+    if (GetEnvironmentVariableW(L"OPENSSL_WIN32_UTF8", NULL, 0) == 0)
+        return;
+
     newargc = 0;
     newargv = NULL;
     if (!validate_argv(newargc))
@@ -299,6 +302,6 @@ void win32_utf8argv(int *argc, char **argv[])
     return;
 }
 #else
-void win32_utf8argv(int &argc, char **argv[])
+void win32_utf8argv(int *argc, char **argv[])
 {   return;   }
 #endif