[gtk: 3/3] Merge branch 'fix.nonunix.builds' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 0546fd7c8ab8c1d9bb793a30d8dc3ebaabad7e46
Merge: ba3549fa34 d51e3e835e
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Dec 16 17:38:56 2019 +0000

    Merge branch 'fix.nonunix.builds' into 'master'
    
    Fix non-portal (UNIX) builds
    
    See merge request GNOME/gtk!1252

 gdk/filetransferportal.c     |  5 +++++
 gdk/gdkcontentdeserializer.c | 12 ++++++++++--
 gdk/gdkcontentserializer.c   | 12 ++++++++++--
 tests/simple.c               | 27 ++++++++++++++++++++++++---
 tests/testclipboard2.c       | 25 +++++++++++++++++++++++++
 5 files changed, 74 insertions(+), 7 deletions(-)
---
diff --cc gdk/filetransferportal.c
index ff9c799674,bb213e1a37..382c8bd299
--- a/gdk/filetransferportal.c
+++ b/gdk/filetransferportal.c
@@@ -24,18 -24,11 +24,21 @@@
  #include <fcntl.h>
  
  #include <gio/gio.h>
+ 
+ #ifdef G_OS_UNIX
+ 
  #include <gio/gunixfdlist.h>
  
 +#ifndef O_PATH
 +#define O_PATH 0
 +#endif
 +
 +#ifndef O_CLOEXEC
 +#define O_CLOEXEC 0
 +#else
 +#define HAVE_O_CLOEXEC 1
 +#endif
 +
  #include "filetransferportalprivate.h"
  
  static GDBusProxy *file_transfer_proxy = NULL;