1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
Description: FTBFS fixes for GCC 4.6 and up
Refreshed for 0.2.6+svn20070727.r22
Origin: vendor
Reviewed-by: Aron Xu <aron@debian.org>, Anthony Fok <foka@debian.org>
Last-Update: 2018-08-17
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/global.h
+++ b/src/global.h
@@ -27,6 +27,8 @@
#define _(String) gettext (String)
#define gettext_noop(String) (String)
+#include <cstring>
+
#include "graphdev.h"
#include "hzdecoder.h"
//class Console;
--- a/src/graphdev.cpp
+++ b/src/graphdev.cpp
@@ -26,6 +26,7 @@
#include <sys/mman.h>
#include <assert.h>
#include <iostream>
+#include <cstring>
#include "display/fbdev.h"
#include "display/vgadev.h"
--- a/src/winime.cpp
+++ b/src/winime.cpp
@@ -250,7 +250,7 @@
if (p == (char *) 0xffffffff)
found = false;
- p = (unsigned int) p + mpText;
+ p = (unsigned long) p + mpText;
} //2nd level index
else if (mNum == 1) {
int l = strlen(mHead.mCodeSet);
@@ -271,7 +271,7 @@
if (p == (char *) 0xffffffff)
found = false;
- p = (unsigned int) p + mpText;
+ p = (unsigned long) p + mpText;
} else if (mNum < mHead.mMaxCodes) {
p = mpOffset[mNum - 1];
if (p == (char *) 0xffffffff)
--- a/src/uniconinputserver.cpp
+++ b/src/uniconinputserver.cpp
@@ -22,7 +22,6 @@
#include <unistd.h>
#include <cassert>
-#include "debug.h"
#include "candilist.h"
#include "uniconinputserver.h"
|
