From d718fa92bdb124dca976c154c2d1465d7a133d56 Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 19:49:37 +0100 Subject: [PATCH] Moved WINCE gmtime_s to own file --- Makefile | 1 + src/libhttp.c | 7 ------- src/wince_gmtime_s.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 src/wince_gmtime_s.c diff --git a/Makefile b/Makefile index ceeac070..0017e4cc 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_s.c \ src/wince_localtime_s.c \ src/wince_time.c LIB_INLINE = src/mod_lua.inl src/md5.inl diff --git a/src/libhttp.c b/src/libhttp.c index 580d3f75..700c28dc 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -124,13 +124,6 @@ pthread_mutexattr_t XX_httplib_pthread_mutex_attr; /* Create substitutes for POSIX functions in Win32. */ -struct tm * gmtime_s( const time_t *ptime, struct tm *ptm ) { - /* FIXME(lsm): fix this. */ - return localtime_s(ptime, ptm); - -} /* gmtime_s */ - - static struct tm tm_array[MAX_WORKER_THREADS]; static int tm_index = 0; diff --git a/src/wince_gmtime_s.c b/src/wince_gmtime_s.c new file mode 100644 index 00000000..00f8fac7 --- /dev/null +++ b/src/wince_gmtime_s.c @@ -0,0 +1,39 @@ +/* + * 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_s( const time_t *ptime, struct tm *ptm ) { + /* FIXME(lsm): fix this. */ + return localtime_s(ptime, ptm); + +} /* gmtime_s */ + +#endif /* defined(_WIN32_WCE) */