From: Yann Collet <cyan@fb.com>
Date: Tue, 26 Nov 2019 23:16:53 +0000 (-0800)
Subject: util: isolated some dependencies
X-Git-Tag: v1.4.5^2~141^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a684b82774556f3546123230ccdb95d528c41012;p=thirdparty%2Fzstd.git

util: isolated some dependencies

from *.h to *.c
so that they don't get transitively included
into users of util.h.
---

diff --git a/programs/util.c b/programs/util.c
index 3c541c550..5354e864d 100644
--- a/programs/util.c
+++ b/programs/util.c
@@ -17,9 +17,24 @@ extern "C" {
 *  Dependencies
 ******************************************/
 #include "util.h"       /* note : ensure that platform.h is included first ! */
+#include <stdlib.h>     /* malloc, realloc, free */
+#include <time.h>       /* clock_t, clock, CLOCKS_PER_SEC, nanosleep */
 #include <errno.h>
 #include <assert.h>
 
+#if defined(_WIN32)
+#  include <sys/utime.h>  /* utime */
+#  include <io.h>         /* _chmod */
+#else
+#  include <unistd.h>     /* chown, stat */
+#  if PLATFORM_POSIX_VERSION < 200809L
+#    include <utime.h>    /* utime */
+#  else
+#    include <fcntl.h>    /* AT_FDCWD */
+#    include <sys/stat.h> /* utimensat */
+#  endif
+#endif
+
 #if defined(_MSC_VER) || defined(__MINGW32__) || defined (__MSVCRT__)
 #include <direct.h>     /* needed for _mkdir in windows */
 #endif
diff --git a/programs/util.h b/programs/util.h
index 27f5d5a0b..53431657d 100644
--- a/programs/util.h
+++ b/programs/util.h
@@ -20,25 +20,11 @@ extern "C" {
 *  Dependencies
 ******************************************/
 #include "platform.h"     /* PLATFORM_POSIX_VERSION, ZSTD_NANOSLEEP_SUPPORT, ZSTD_SETPRIORITY_SUPPORT */
-#include <stdlib.h>       /* malloc, realloc, free */
 #include <stddef.h>       /* size_t, ptrdiff_t */
 #include <stdio.h>        /* fprintf */
 #include <sys/types.h>    /* stat, utime */
 #include <sys/stat.h>     /* stat, chmod */
-#if defined(_WIN32)
-#  include <sys/utime.h>  /* utime */
-#  include <io.h>         /* _chmod */
-#else
-#  include <unistd.h>     /* chown, stat */
-#  if PLATFORM_POSIX_VERSION < 200809L
-#    include <utime.h>      /* utime */
-#  else
-#    include <fcntl.h>      /* AT_FDCWD */
-#    include <sys/stat.h>   /* utimensat */
-#  endif
-#endif
-#include <time.h>         /* clock_t, clock, CLOCKS_PER_SEC, nanosleep */
-#include "mem.h"          /* U32, U64 */
+#include "mem.h"          /* U64 */
 
 /*-************************************************************
 * Avoid fseek()'s 2GiB barrier with MSVC, macOS, *BSD, MinGW