mirror of
https://github.com/curl/curl.git
synced 2024-12-21 06:50:10 +08:00
e9a7d4a1c8
Windows compilers define `_WIN32` automatically. Windows SDK headers or build env defines `WIN32`, or we have to take care of it. The agreement seems to be that `_WIN32` is the preferred practice here. Make the source code rely on that to detect we're building for Windows. Public `curl.h` was using `WIN32`, `__WIN32__` and `CURL_WIN32` for Windows detection, next to the official `_WIN32`. After this patch it only uses `_WIN32` for this. Also, make it stop defining `CURL_WIN32`. There is a slight chance these break compatibility with Windows compilers that fail to define `_WIN32`. I'm not aware of any obsolete or modern compiler affected, but in case there is one, one possible solution is to define this macro manually. grepping for `WIN32` remains useful to discover Windows-specific code. Also: - extend `checksrc` to ensure we're not using `WIN32` anymore. - apply minor formatting here and there. - delete unnecessary checks for `!MSDOS` when `_WIN32` is present. Co-authored-by: Jay Satiro Reviewed-by: Daniel Stenberg Closes #12376
89 lines
2.6 KiB
C
89 lines
2.6 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "timediff.h"
|
|
|
|
#include <limits.h>
|
|
|
|
/*
|
|
* Converts number of milliseconds into a timeval structure.
|
|
*
|
|
* Return values:
|
|
* NULL IF tv is NULL or ms < 0 (eg. no timeout -> blocking select)
|
|
* tv with 0 in both fields IF ms == 0 (eg. 0ms timeout -> polling select)
|
|
* tv with converted fields IF ms > 0 (eg. >0ms timeout -> waiting select)
|
|
*/
|
|
struct timeval *curlx_mstotv(struct timeval *tv, timediff_t ms)
|
|
{
|
|
if(!tv)
|
|
return NULL;
|
|
|
|
if(ms < 0)
|
|
return NULL;
|
|
|
|
if(ms > 0) {
|
|
timediff_t tv_sec = ms / 1000;
|
|
timediff_t tv_usec = (ms % 1000) * 1000; /* max=999999 */
|
|
#ifdef HAVE_SUSECONDS_T
|
|
#if TIMEDIFF_T_MAX > TIME_T_MAX
|
|
/* tv_sec overflow check in case time_t is signed */
|
|
if(tv_sec > TIME_T_MAX)
|
|
tv_sec = TIME_T_MAX;
|
|
#endif
|
|
tv->tv_sec = (time_t)tv_sec;
|
|
tv->tv_usec = (suseconds_t)tv_usec;
|
|
#elif defined(_WIN32) /* maybe also others in the future */
|
|
#if TIMEDIFF_T_MAX > LONG_MAX
|
|
/* tv_sec overflow check on Windows there we know it is long */
|
|
if(tv_sec > LONG_MAX)
|
|
tv_sec = LONG_MAX;
|
|
#endif
|
|
tv->tv_sec = (long)tv_sec;
|
|
tv->tv_usec = (long)tv_usec;
|
|
#else
|
|
#if TIMEDIFF_T_MAX > INT_MAX
|
|
/* tv_sec overflow check in case time_t is signed */
|
|
if(tv_sec > INT_MAX)
|
|
tv_sec = INT_MAX;
|
|
#endif
|
|
tv->tv_sec = (int)tv_sec;
|
|
tv->tv_usec = (int)tv_usec;
|
|
#endif
|
|
}
|
|
else {
|
|
tv->tv_sec = 0;
|
|
tv->tv_usec = 0;
|
|
}
|
|
|
|
return tv;
|
|
}
|
|
|
|
/*
|
|
* Converts a timeval structure into number of milliseconds.
|
|
*/
|
|
timediff_t curlx_tvtoms(struct timeval *tv)
|
|
{
|
|
return (tv->tv_sec*1000) + (timediff_t)(((double)tv->tv_usec)/1000.0);
|
|
}
|