Midori Web Browser

Merge lp:~tuxator/midori/mingw-on-f20 into lp:midori

  1. mingw-on-f20
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6567
Merged at revision: 6567
Proposed branch: lp:~tuxator/midori/mingw-on-f20
Merge into: lp:midori
Diff against target: 26 lines (+5/-0)
2 files modified
midori/midori-app.c (+1/-0)
midori/midori-websettings.c (+4/-0)
To merge this branch: bzr merge lp:~tuxator/midori/mingw-on-f20
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+207898@code.launchpad.net

Commit message

Fix building with newer mingw versions

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Seems legit.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-app.c'
2--- midori/midori-app.c 2014-02-18 22:05:09 +0000
3+++ midori/midori-app.c 2014-02-24 11:45:18 +0000
4@@ -13,6 +13,7 @@
5 #ifdef _WIN32
6 #define _WIN32_WINNT 0x0501
7 #include <unistd.h>
8+ #include <windows.h>
9 #endif
10
11 #if HAVE_CONFIG_H
12
13=== modified file 'midori/midori-websettings.c'
14--- midori/midori-websettings.c 2013-11-13 04:55:19 +0000
15+++ midori/midori-websettings.c 2014-02-24 11:45:18 +0000
16@@ -33,6 +33,10 @@
17 #include <sys/sysctl.h>
18 #endif
19
20+#if defined (G_OS_WIN32)
21+ #include <sysinfoapi.h>
22+#endif
23+
24 #ifdef HAVE_WEBKIT2
25 #define WEB_SETTINGS_STRING(x) "WebKitSettings::"x""
26 #else

Subscribers

People subscribed via source and target branches

to all changes: