From 7b685637d0701a15424815b0a4202b43e28be0ab Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Sun, 27 Nov 2016 14:29:07 +0100
Subject: Remove unneeded "#include <arpa/inet.h>" in "cairo-utils.cpp"

Fixed bugs:
  - https://launchpad.net/bugs/1645062

(bzr r15280)
---
 src/display/cairo-utils.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/display/cairo-utils.cpp')

diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index a7625f4a1..01b0d807c 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -13,7 +13,6 @@
 #endif
 
 #include "display/cairo-utils.h"
-#include <arpa/inet.h>
 
 #include <stdexcept>
 #include <glib/gstdio.h>
-- 
cgit v1.2.3


From 00bf8be09a333bb7434eeba9e885e6089b6eb5fd Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Thu, 12 Jan 2017 22:45:33 +0100
Subject: Use GStatBuf where appropriate to ensure usage of the correct type
 (fixes compilation with i686-w64-mingw32)

(bzr r15414)
---
 src/display/cairo-utils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/display/cairo-utils.cpp')

diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index 01b0d807c..8045007e7 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -290,7 +290,7 @@ Pixbuf *Pixbuf::create_from_file(std::string const &fn)
     if (!g_file_test(fn.c_str(), G_FILE_TEST_EXISTS)) { 
         return NULL;
     }
-    struct stat stdir;
+    GStatBuf stdir;
     int val = g_stat(fn.c_str(), &stdir);
     if (val == 0 && stdir.st_mode & S_IFDIR){
         return NULL;
-- 
cgit v1.2.3