Commit 4233a4fe authored by Mouse's avatar Mouse

Merge remote-tracking branch 'upstream/master' into vlm_master

parents da2cbdb6 88ed3b5c
/* /*
* Copyright (c) 2005 Lev Walkin <vlm@lionet.info>. All rights reserved. * Copyright (c) 2005-2019 Lev Walkin <vlm@lionet.info>. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <stdarg.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
......
/*- /*-
* Copyright (c) 2003-2017 Lev Walkin <vlm@lionet.info>. All rights reserved. * Copyright (c) 2003-2019 Lev Walkin <vlm@lionet.info>. All rights reserved.
* Redistribution and modifications are permitted subject to BSD license. * Redistribution and modifications are permitted subject to BSD license.
*/ */
#define _POSIX_PTHREAD_SEMANTICS /* for Sun */ #define _POSIX_PTHREAD_SEMANTICS /* for Sun */
...@@ -57,7 +57,7 @@ static struct tm *gmtime_r(const time_t *tloc, struct tm *result) { ...@@ -57,7 +57,7 @@ static struct tm *gmtime_r(const time_t *tloc, struct tm *result) {
* Where to look for offset from GMT, Phase I. * Where to look for offset from GMT, Phase I.
* Several platforms are known. * Several platforms are known.
*/ */
#if defined(__FreeBSD__) \ #if defined(__FreeBSD__) || defined(__OpenBSD__) \
|| (defined(__GNUC__) && defined(__APPLE_CC__)) \ || (defined(__GNUC__) && defined(__APPLE_CC__)) \
|| (defined __GLIBC__ && __GLIBC__ >= 2) || (defined __GLIBC__ && __GLIBC__ >= 2)
#undef HAVE_TM_GMTOFF #undef HAVE_TM_GMTOFF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment