From bce0bbd63c0b0afc28d2cc9acee0b9ac0cc92d0d Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 19:57:23 +0100 Subject: [PATCH] Moved WINCE gmtime to own file --- Makefile | 1 + src/libhttp.c | 8 -------- src/wince_gmtime.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 src/wince_gmtime.c diff --git a/Makefile b/Makefile index e3c2332a..d74754a0 100644 --- a/Makefile +++ b/Makefile @@ -253,6 +253,7 @@ LIB_SOURCES = src/libhttp.c \ src/win32_pthread_mutex_unlock.c \ src/win32_pthread_self.c \ src/win32_pthread_setspecific.c \ + src/wince_gmtime.c \ src/wince_gmtime_s.c \ src/wince_localtime.c \ src/wince_localtime_s.c \ diff --git a/src/libhttp.c b/src/libhttp.c index 53ab156b..4e4fe1b7 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -124,14 +124,6 @@ pthread_mutexattr_t XX_httplib_pthread_mutex_attr; /* Create substitutes for POSIX functions in Win32. */ -struct tm *gmtime( const time_t *ptime ) { - - int i = XX_httplib_atomic_inc(&XX_httplib_tm_index) % MAX_WORKER_THREADS; - return gmtime_s(ptime, XX_httplib_tm_array + i); - -} /* gmtime */ - - size_t strftime( char *dst, size_t dst_size, const char *fmt, const struct tm *tm ) { /* TODO */ //(void)XX_httplib_snprintf(NULL, dst, dst_size, "implement strftime() diff --git a/src/wince_gmtime.c b/src/wince_gmtime.c new file mode 100644 index 00000000..e9ca6b7f --- /dev/null +++ b/src/wince_gmtime.c @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2016 Lammert Bies + * Copyright (c) 2013-2016 the Civetweb developers + * Copyright (c) 2004-2013 Sergey Lyubka + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + + + +#include "libhttp-private.h" + + + +#if defined(_WIN32_WCE) + +struct tm *gmtime( const time_t *ptime ) { + + int i = XX_httplib_atomic_inc(&XX_httplib_tm_index) % MAX_WORKER_THREADS; + return gmtime_s(ptime, XX_httplib_tm_array + i); + +} /* gmtime */ + +#endif /* defined(_WIN32_WCE) */