Apply all the changes submitted by Steven M. Schweda <sms@antinode.info>
This commit is contained in:
@@ -64,12 +64,18 @@
|
||||
#include "o_time.h"
|
||||
|
||||
#ifdef OPENSSL_SYS_VMS
|
||||
# include <libdtdef.h>
|
||||
# include <lib$routines.h>
|
||||
# include <lnmdef.h>
|
||||
# include <starlet.h>
|
||||
# include <descrip.h>
|
||||
# include <stdlib.h>
|
||||
# if __CRTL_VER >= 70000000 && \
|
||||
(defined _POSIX_C_SOURCE || !defined _ANSI_C_SOURCE)
|
||||
# define VMS_GMTIME_OK
|
||||
# endif
|
||||
# ifndef VMS_GMTIME_OK
|
||||
# include <libdtdef.h>
|
||||
# include <lib$routines.h>
|
||||
# include <lnmdef.h>
|
||||
# include <starlet.h>
|
||||
# include <descrip.h>
|
||||
# include <stdlib.h>
|
||||
# endif /* ndef VMS_GMTIME_OK */
|
||||
#endif
|
||||
|
||||
struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
|
||||
@@ -81,7 +87,7 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
|
||||
so we don't even look at the return value */
|
||||
gmtime_r(timer,result);
|
||||
ts = result;
|
||||
#elif !defined(OPENSSL_SYS_VMS)
|
||||
#elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
|
||||
ts = gmtime(timer);
|
||||
if (ts == NULL)
|
||||
return NULL;
|
||||
@@ -89,7 +95,7 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
|
||||
memcpy(result, ts, sizeof(struct tm));
|
||||
ts = result;
|
||||
#endif
|
||||
#ifdef OPENSSL_SYS_VMS
|
||||
#if defined( OPENSSL_SYS_VMS) && !defined( VMS_GMTIME_OK)
|
||||
if (ts == NULL)
|
||||
{
|
||||
static $DESCRIPTOR(tabnam,"LNM$DCL_LOGICAL");
|
||||
|
||||
Reference in New Issue
Block a user