diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-04-01 12:36:51 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-04-01 16:23:35 +0200 |
| commit | 368058d0a79d2e3b853746b09ca86679a86ac233 (patch) | |
| tree | 7f4b2dd3b31f56b99c113d5a94fff46d311c8ab6 /apps/apps.h | |
| parent | 5902821d81ced5e7c5db972e4b569848500940f7 (diff) | |
Force argv to be an array of long pointers on VMS
Reverts commit 087ca80ad83071dde0bb6bc1c28c743caa00eaf8
Instead of battling the odd format of argv given to main() in default
P64 mode, tell the compiler to make it an array of 64-bit pointers
when compiling in P64 mode.
A note is added in NOTES.VMS regarding minimum DEC C version.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'apps/apps.h')
| -rw-r--r-- | apps/apps.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/apps/apps.h b/apps/apps.h index 7cf0dc4b6a..434ca54b7d 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -445,15 +445,12 @@ typedef struct args_st { char **argv; } ARGS; -#if defined(OPENSSL_SYS_VMS) && defined(__DECC) -# pragma pointer_size save -# pragma pointer_size 32 -typedef char **argv_t; -# pragma pointer_size restore -char **copy_argv(int *argc, argv_t argv); -#else -typedef char **argv_t; -#endif +/* + * VMS C only for now, implemented in vms_decc_init.c + * If other C compilers forget to terminate argv with NULL, this function + * can be re-used. + */ +char **copy_argv(int *argc, char *argv[]); # define PW_MIN_LENGTH 4 |