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
|
Author: Daniel Leidert
Description: Fix conflicting definitions.
Bug-Debian: https://bugs.debian.org/748031
--- a/undo.c
+++ b/undo.c
@@ -311,7 +311,7 @@
UNDO_SUCCESS;
}
-unsigned
+unsigned int
undo_get_undo_count (void)
{
if (undo_session == NULL)
@@ -320,7 +320,7 @@
return undo_history_undo_count (undo_session->history);
}
-unsigned
+unsigned int
undo_get_redo_count (void)
{
if (undo_session == NULL)
--- a/ct.h
+++ b/ct.h
@@ -235,8 +235,8 @@
extern void pdbrotate(int,int,int);
#ifdef LIBUNDO
-extern int undo_get_undo_count();
-extern int undo_get_redo_count();
+extern unsigned int undo_get_undo_count();
+extern unsigned int undo_get_redo_count();
extern int undo_undo();
extern int undo_undo();
extern int undo_redo();
--- a/undo.h
+++ b/undo.h
@@ -49,8 +49,8 @@
int undo_undo(void);
int undo_redo(void);
-unsigned undo_get_undo_count(void);
-unsigned undo_get_redo_count(void);
+unsigned int undo_get_undo_count(void);
+unsigned int undo_get_redo_count(void);
/* Error codes */
#define UNDO_NOERROR 0 /* No error */
|
