Move #includes out of extern "C" blocks

Do some include shuffling for `**.h` files within lib, programs, tests, and zlibWrapper.
`lib/legacy` and `lib/deprecated` are untouched.
`#include`s within `extern "C"` blocks in .cpp files are untouched.

todo: shuffling for `xxhash.h`
This commit is contained in:
Victor Zhang
2024-12-17 17:55:07 -08:00
parent 0218c8de0f
commit fc726da774
27 changed files with 135 additions and 121 deletions
+11 -5
View File
@@ -11,15 +11,22 @@
#ifndef ZSTD_FILEIO_COMMON_H
#define ZSTD_FILEIO_COMMON_H
#if defined (__cplusplus)
extern "C" {
#endif
#include "../lib/common/mem.h" /* U32, U64 */
#include "fileio_types.h"
#include "platform.h"
#include "timefn.h" /* UTIL_getTime, UTIL_clockSpanMicro */
#if !(defined(_MSC_VER) && _MSC_VER >= 1400) \
&& !(!defined(__64BIT__) && (PLATFORM_POSIX_VERSION >= 200112L)) \
&& !(defined(__MINGW32__) && !defined(__STRICT_ANSI__) && !defined(__NO_MINGW_LFS) && defined(__MSVCRT__)) \
&& (defined(_WIN32) && !defined(__DJGPP__))
# include <windows.h>
#endif
#if defined (__cplusplus)
extern "C" {
#endif
/*-*************************************
* Macros
***************************************/
@@ -89,7 +96,6 @@ extern UTIL_time_t g_displayClock;
# define LONG_SEEK fseeko64
# define LONG_TELL ftello64
#elif defined(_WIN32) && !defined(__DJGPP__)
# include <windows.h>
static int LONG_SEEK(FILE* file, __int64 offset, int origin) {
LARGE_INTEGER off;
DWORD method;