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
78 lines
2.3 KiB
C
78 lines
2.3 KiB
C
#ifndef HEADER_CURL_TOOL_SETUP_H
|
|
#define HEADER_CURL_TOOL_SETUP_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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
|
|
*
|
|
***************************************************************************/
|
|
|
|
#define CURL_NO_OLDIES
|
|
|
|
/*
|
|
* curl_setup.h may define preprocessor macros such as _FILE_OFFSET_BITS and
|
|
* _LARGE_FILES in order to support files larger than 2 GB. On platforms
|
|
* where this happens it is mandatory that these macros are defined before
|
|
* any system header file is included, otherwise file handling function
|
|
* prototypes will be misdeclared and curl tool may not build properly;
|
|
* therefore we must include curl_setup.h before curl.h when building curl.
|
|
*/
|
|
|
|
#include "curl_setup.h" /* from the lib directory */
|
|
|
|
extern FILE *tool_stderr;
|
|
|
|
/*
|
|
* curl tool certainly uses libcurl's external interface.
|
|
*/
|
|
|
|
#include <curl/curl.h> /* external interface */
|
|
|
|
/*
|
|
* Platform specific stuff.
|
|
*/
|
|
|
|
#ifdef macintosh
|
|
# define main(x,y) curl_main(x,y)
|
|
#endif
|
|
|
|
#ifndef OS
|
|
# define OS "unknown"
|
|
#endif
|
|
|
|
#ifndef UNPRINTABLE_CHAR
|
|
/* define what to use for unprintable characters */
|
|
# define UNPRINTABLE_CHAR '.'
|
|
#endif
|
|
|
|
#ifndef HAVE_STRDUP
|
|
# include "tool_strdup.h"
|
|
#endif
|
|
|
|
#if defined(_WIN32)
|
|
/* set in win32_init() */
|
|
extern LARGE_INTEGER tool_freq;
|
|
extern bool tool_isVistaOrGreater;
|
|
/* set in init_terminal() */
|
|
extern bool tool_term_has_bold;
|
|
#endif
|
|
|
|
#endif /* HEADER_CURL_TOOL_SETUP_H */
|