From ec93d9e12593399e5b47b4dc52c1a0a4470be02c Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Wed, 16 Jan 2019 10:24:11 -0500
Subject: [PATCH] MSVC: Move dirent implementation to glib/dirent/

---
 {build/win32 => glib}/dirent/README     | 0
 {build/win32 => glib}/dirent/dirent-zip | 0
 {build/win32 => glib}/dirent/dirent.c   | 0
 {build/win32 => glib}/dirent/dirent.h   | 0
 {build/win32 => glib}/dirent/wdirent.c  | 0
 glib/gdir.c                             | 3 +--
 glib/meson.build                        | 3 +++
 7 files changed, 4 insertions(+), 2 deletions(-)
 rename {build/win32 => glib}/dirent/README (100%)
 rename {build/win32 => glib}/dirent/dirent-zip (100%)
 rename {build/win32 => glib}/dirent/dirent.c (100%)
 rename {build/win32 => glib}/dirent/dirent.h (100%)
 rename {build/win32 => glib}/dirent/wdirent.c (100%)

diff --git a/build/win32/dirent/README b/glib/dirent/README
similarity index 100%
rename from build/win32/dirent/README
rename to glib/dirent/README
diff --git a/build/win32/dirent/dirent-zip b/glib/dirent/dirent-zip
similarity index 100%
rename from build/win32/dirent/dirent-zip
rename to glib/dirent/dirent-zip
diff --git a/build/win32/dirent/dirent.c b/glib/dirent/dirent.c
similarity index 100%
rename from build/win32/dirent/dirent.c
rename to glib/dirent/dirent.c
diff --git a/build/win32/dirent/dirent.h b/glib/dirent/dirent.h
similarity index 100%
rename from build/win32/dirent/dirent.h
rename to glib/dirent/dirent.h
diff --git a/build/win32/dirent/wdirent.c b/glib/dirent/wdirent.c
similarity index 100%
rename from build/win32/dirent/wdirent.c
rename to glib/dirent/wdirent.c
diff --git a/glib/gdir.c b/glib/gdir.c
index cb4ad0b2f..d0b2d5eed 100644
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -41,8 +41,7 @@
 #include "glibintl.h"
 
 #if defined (_MSC_VER) && !defined (HAVE_DIRENT_H)
-#include "../build/win32/dirent/dirent.h"
-#include "../build/win32/dirent/wdirent.c"
+#include "dirent/dirent.h"
 #endif
 
 #include "glib-private.h" /* g_dir_open_with_errno, g_dir_new_from_dirp */
diff --git a/glib/meson.build b/glib/meson.build
index 1fe4a6e73..512ab82d2 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -222,6 +222,9 @@ if host_system == 'windows'
   glib_sources += [glib_win_res]
   glib_sources += files('gwin32.c', 'gspawn-win32.c', 'giowin32.c')
   platform_deps = [winsock2, cc.find_library('winmm')]
+  if cc.get_id() == 'msvc'
+    glib_sources += files('dirent/wdirent.c')
+  endif
 else
   glib_sources += files('glib-unix.c', 'gspawn.c', 'giounix.c')
   platform_deps = []