X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Funix_apply.c;h=6b3ede19e82778658a1af73aa8e36eed1fb66362;hp=0b96055d8142afe916d35eb9eaab6cc75f2e615e;hb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518;hpb=480d5f19a840f2b3dfef6c256819e9739e8e7a1d;ds=sidebyside diff --git a/src/unix_apply.c b/src/unix_apply.c index 0b96055d..6b3ede19 100644 --- a/src/unix_apply.c +++ b/src/unix_apply.c @@ -21,11 +21,12 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ -#include "config.h" +#ifndef __WIN32__ -#ifdef HAVE_UTIME_H -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif + #include #include #include @@ -33,10 +34,15 @@ #include #include #include +#ifdef HAVE_UTIME_H +# include +#endif -#include "timestamp.h" -#include "wimlib_internal.h" -#include "lookup_table.h" +#include "wimlib/apply.h" +#include "wimlib/error.h" +#include "wimlib/lookup_table.h" +#include "wimlib/reparse.h" +#include "wimlib/timestamp.h" /* Returns the number of components of @path. */ static unsigned @@ -383,8 +389,6 @@ unix_extract_directory(struct wim_dentry *dentry, const tchar *output_path, ret = tstat(output_path, &stbuf); if (ret == 0) { if (S_ISDIR(stbuf.st_mode)) { - /*if (!is_root)*/ - /*WARNING("`%s' already exists", output_path);*/ goto dir_exists; } else { ERROR("`%"TS"' is not a directory", output_path); @@ -493,3 +497,5 @@ unix_do_apply_dentry_timestamps(const char *output_path, } return 0; } + +#endif /* !__WIN32__ */