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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
|
diff -Naur fex-0.8.18-orig/src/client.cpp fex-0.8.18/src/client.cpp
--- fex-0.8.18-orig/src/client.cpp 2004-12-19 17:49:45.000000000 -0600
+++ fex-0.8.18/src/client.cpp 2007-12-28 21:03:30.000000000 -0600
@@ -53,7 +53,7 @@
{
lc.info("start fullsync");
parent().write(fex_header(ME_FullSyncStart));
- parent().wp()->createStateFile((unsigned)this, &_M_ClientFile);
+ parent().wp()->createStateFile((unsigned long)this, &_M_ClientFile);
}
void FullSyncDialog::
diff -Naur fex-0.8.18-orig/src/dialog.cpp fex-0.8.18/src/dialog.cpp
--- fex-0.8.18-orig/src/dialog.cpp 2005-05-11 10:20:52.000000000 -0600
+++ fex-0.8.18/src/dialog.cpp 2007-12-28 21:03:58.000000000 -0600
@@ -224,7 +224,7 @@
ModLog::iterator i;
for(i = _M_Log.begin(); i != _M_Log.end(); i++) {
if (! FileListener::get().lock(parent().wp()->path() + i->first.str(),
- (unsigned int)&parent())) {
+ (unsigned long)&parent())) {
ModLog::iterator j;
for(j = _M_Log.begin(); j != i; j++) {
FileListener::get().unlock(parent().wp(),
diff -Naur fex-0.8.18-orig/src/filelistener.cpp fex-0.8.18/src/filelistener.cpp
--- fex-0.8.18-orig/src/filelistener.cpp 2005-06-07 09:49:06.000000000 -0600
+++ fex-0.8.18/src/filelistener.cpp 2007-12-28 21:04:42.000000000 -0600
@@ -355,7 +355,7 @@
_M_FDBuffer[0].reserve(MinFDBufferSize);
_M_FDBuffer[1].reserve(MinFDBufferSize);
- _S_SignalBuffer = (int)&_M_FDBuffer[0];
+ _S_SignalBuffer = (long)&_M_FDBuffer[0];
_M_ReadBuffer = &_M_FDBuffer[1];
assert(! _S_WakeUpPipe.first);
@@ -439,7 +439,7 @@
typedef FileListener::FileEvent::reqs_m::iterator iterator;
_M_ReadBuffer->reserve(_M_Handler->size() + MinFDBufferSize);
- _S_SignalBuffer = (int)_M_ReadBuffer;
+ _S_SignalBuffer = (long)_M_ReadBuffer;
_M_ReadBuffer = &_M_FDBuffer[_M_ReadBuffer == &_M_FDBuffer[0] ? 1 : 0];
if (_S_RenewAll) {
diff -Naur fex-0.8.18-orig/src/nmstl/netioevent fex-0.8.18/src/nmstl/netioevent
--- fex-0.8.18-orig/src/nmstl/netioevent 2004-12-12 16:34:50.000000000 -0600
+++ fex-0.8.18/src/nmstl/netioevent 2007-12-28 21:05:51.000000000 -0600
@@ -138,7 +138,7 @@
io_handler::set_ioh;
private:
- inline void tcp_acceptor::ravail() {
+ inline void ravail() {
address a;
tcpsocket ioh = sock.accept(a);
if (ioh) {
@@ -168,7 +168,7 @@
virtual ~tcp_acceptor() {}
protected:
- inline void tcp_acceptor::ravail() {
+ inline void ravail() {
address a;
tcpsocket ioh = sock.accept(a);
if (ioh) {
diff -Naur fex-0.8.18-orig/src/server.cpp fex-0.8.18/src/server.cpp
--- fex-0.8.18-orig/src/server.cpp 2004-12-19 17:51:23.000000000 -0600
+++ fex-0.8.18/src/server.cpp 2007-12-28 21:06:27.000000000 -0600
@@ -81,7 +81,7 @@
sendStatFile()
{
size_t size;
- size = parent().wp()->createStateFile((unsigned)this, &_M_StateFile);
+ size = parent().wp()->createStateFile((unsigned long)this, &_M_StateFile);
omessage msg;
msg << _M_StateFile << size;
write(fex_header(ME_FullSyncState), msg);
diff -Naur fex-0.8.18-orig/src/watchpoint.cpp fex-0.8.18/src/watchpoint.cpp
--- fex-0.8.18-orig/src/watchpoint.cpp 2004-12-27 08:40:40.000000000 -0600
+++ fex-0.8.18/src/watchpoint.cpp 2007-12-28 21:07:31.000000000 -0600
@@ -188,7 +188,7 @@
unsigned int lock_id,
bool do_sync)
{
- if (lock_id == (unsigned int)this)
+ if (lock_id == (unsigned long)this)
return;
pair<ModLog::iterator, bool> res = _M_WriteLog->insert(key, state);
@@ -327,7 +327,7 @@
save_state()
{
if (_M_Mode >= MO_fullsynched)
- wp()->createStateFile((unsigned)this, NULL);
+ wp()->createStateFile((unsigned long)this, NULL);
}
diff -rupN fex-0.8.18b/src/modlog.cpp fex-0.8.18/src/modlog.cpp
--- fex-0.8.18b/src/modlog.cpp 2009-01-22 17:00:41.000000000 -0400
+++ fex-0.8.18/src/modlog.cpp 2009-01-22 17:03:44.000000000 -0400
@@ -27,6 +27,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
+#include <cstdlib>
extern "C" {
#include <librsync.h>
}
diff -rupN fex-0.8.18b/src/modlog.h fex-0.8.18/src/modlog.h
--- fex-0.8.18b/src/modlog.h 2009-01-22 17:00:41.000000000 -0400
+++ fex-0.8.18/src/modlog.h 2009-01-22 17:01:44.000000000 -0400
@@ -22,7 +22,7 @@
#ifndef MODLOG_H
#define MODLOG_H
-#include <string>
+#include <cstring>
#include <map>
diff -rupN fex-0.8.18b/src/nmstl/status fex-0.8.18/src/nmstl/status
--- fex-0.8.18b/src/nmstl/status 2009-01-22 17:00:41.000000000 -0400
+++ fex-0.8.18/src/nmstl/status 2009-01-22 17:02:12.000000000 -0400
@@ -23,7 +23,7 @@
#ifndef NMSTL_H_STATUS
#define NMSTL_H_STATUS
-#include <string>
+#include <cstring>
#include <nmstl/internal.h>
NMSTL_NAMESPACE_BEGIN;
diff -rupN fex-0.8.18b/src/nmstl_src/debug.cc fex-0.8.18/src/nmstl_src/debug.cc
--- fex-0.8.18b/src/nmstl_src/debug.cc 2009-01-22 17:00:41.000000000 -0400
+++ fex-0.8.18/src/nmstl_src/debug.cc 2009-01-22 17:04:16.000000000 -0400
@@ -20,7 +20,8 @@
*
*/
-#include <iostream>
+#include <cstdlib>
+#include <cstring>
#include <nmstl/debug>
#include <nmstl/thread>
diff -rupN fex-0.8.18b/src/nmstl_src/internal.cc fex-0.8.18/src/nmstl_src/internal.cc
--- fex-0.8.18b/src/nmstl_src/internal.cc 2009-01-22 17:00:41.000000000 -0400
+++ fex-0.8.18/src/nmstl_src/internal.cc 2009-01-22 17:04:45.000000000 -0400
@@ -21,6 +21,7 @@
*/
#include <nmstl/internal.h>
+#include <cstdlib>
#undef NMSTL_DEBUG_FILE_H
#define NMSTL_DEBUG_FILE_H "nmstl/internal"
|
GitWeb