From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 16 Dec 2019 17:38:56 +0000 (+0000)
Subject: Merge branch 'fix.nonunix.builds' into 'master'
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~522
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0546fd7c8ab8c1d9bb793a30d8dc3ebaabad7e46;p=gtk4.git

Merge branch 'fix.nonunix.builds' into 'master'

Fix non-portal (UNIX) builds

See merge request GNOME/gtk!1252
---

0546fd7c8ab8c1d9bb793a30d8dc3ebaabad7e46
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;