Mercurial > mxe-octave

comparison src/wt-1-fixes.patch @ 2781:095252f38f87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package wt
author Mark Brand <mabrand@mabrand.nl>
date Sun, 23 Sep 2012 20:49:56 +0200
parents 63b62afe771b
children 11504b1a840f
comparison
equal deleted inserted replaced
2780:016ef289a545 2781:095252f38f87
1 This file is part of MXE. 1 This file is part of MXE.
2 See index.html for further information. 2 See index.html for further information.
3 3
4 From 29e0f572f1c1875089601cb0dcae3bd1c3ea7118 Mon Sep 17 00:00:00 2001 4 From 52fc36d3d87c8fc3df1b4bb005ef39bd61db2fef Mon Sep 17 00:00:00 2001
5 From: Mark Brand <mabrand@mabrand.nl>
6 Date: Mon, 18 Jun 2012 13:02:03 +0200
7 Subject: [PATCH 1/2] fix case of winsock2.h which matters when cross-building
8
9 taken from
10 http://sourceforge.net/mailarchive/message.php?msg_id=29421539
11 ---
12 src/Wt/Auth/HashFunction.C | 2 +-
13 src/Wt/Utils.C | 2 +-
14 src/http/Configuration.C | 4 ++--
15 src/web/TimeUtil.C | 2 +-
16 4 files changed, 5 insertions(+), 5 deletions(-)
17
18 diff --git a/src/Wt/Auth/HashFunction.C b/src/Wt/Auth/HashFunction.C
19 index 6d764fa..34615e0 100644
20 --- a/src/Wt/Auth/HashFunction.C
21 +++ b/src/Wt/Auth/HashFunction.C
22 @@ -15,7 +15,7 @@
23 #ifndef WIN32
24 #include <arpa/inet.h>
25 #else
26 -#include <Winsock2.h>
27 +#include <winsock2.h>
28 #endif
29 #endif
30
31 diff --git a/src/Wt/Utils.C b/src/Wt/Utils.C
32 index 02cdf7d..75fca49 100644
33 --- a/src/Wt/Utils.C
34 +++ b/src/Wt/Utils.C
35 @@ -13,7 +13,7 @@
36 #ifndef WIN32
37 #include <arpa/inet.h>
38 #else
39 -#include <Winsock2.h>
40 +#include <winsock2.h>
41 #endif
42
43 #include "Wt/WLogger"
44 diff --git a/src/http/Configuration.C b/src/http/Configuration.C
45 index 6312ae6..3ebf772 100644
46 --- a/src/http/Configuration.C
47 +++ b/src/http/Configuration.C
48 @@ -18,13 +18,13 @@
49 #endif
50 #ifdef WIN32
51 #include <process.h> // for getpid()
52 -#include <Winsock2.h> // for gethostname()
53 +#include <winsock2.h> // for gethostname()
54 #endif
55 #include <iostream>
56 #include <fstream>
57
58 #ifdef __CYGWIN__
59 -#include <Winsock2.h> // for gethostname()
60 +#include <winsock2.h> // for gethostname()
61 #endif
62
63 namespace Wt {
64 diff --git a/src/web/TimeUtil.C b/src/web/TimeUtil.C
65 index fbada4a..94c2423 100644
66 --- a/src/web/TimeUtil.C
67 +++ b/src/web/TimeUtil.C
68 @@ -1,7 +1,7 @@
69 #include "TimeUtil.h"
70
71 #ifdef _MSC_VER
72 -#include "Winsock2.h"
73 +#include "winsock2.h"
74 #pragma comment (lib, "winmm.lib")
75 namespace {
76 #include <windows.h>
77 --
78 1.7.10.4
79
80
81 From f64c3140b11fe2a6d353950229b4edae6ec306a1 Mon Sep 17 00:00:00 2001
82 From: Mark Brand <mabrand@mabrand.nl> 5 From: Mark Brand <mabrand@mabrand.nl>
83 Date: Mon, 18 Jun 2012 13:23:21 +0200 6 Date: Mon, 18 Jun 2012 13:23:21 +0200
84 Subject: [PATCH 2/2] fixes for mxe 7 Subject: [PATCH] fixes for mxe
85 8
86 ---
87 cmake/WtFindBoost-vintage.txt | 1 +
88 cmake/WtFindGm.txt | 6 ++++++
89 cmake/WtFindHaru.txt | 12 ++++++++++++
90 cmake/WtFindPangoFt2.txt | 14 +++++++++-----
91 cmake/WtFindSsl.txt | 5 +++++
92 src/Wt/WRasterImage.C | 9 ---------
93 6 files changed, 33 insertions(+), 14 deletions(-)
94 9
95 diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt 10 diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
96 index e48b21e..1198139 100644 11 index e48b21e..1198139 100644
97 --- a/cmake/WtFindBoost-vintage.txt 12 --- a/cmake/WtFindBoost-vintage.txt
98 +++ b/cmake/WtFindBoost-vintage.txt 13 +++ b/cmake/WtFindBoost-vintage.txt