[cvsnt] Unix port of latest CVSNT

Boyd Meier bmeier at acornsys.com
Tue Oct 22 18:38:23 BST 2002


Is anyone using the unix port of the latest CVSNT?  I'm having issues with
the build of the lockserver, among other things.  I've had to patch the
source as follows to get it to compile under gcc3.2.

	Boyd

----- begin patch

diff -u -x'*.o' -x.deps cvsnt-1.11.1.3/lockservice/LockParse.cpp
cvsnt-1.11.1.3.new/lockservice/LockParse.cpp
--- cvsnt-1.11.1.3/lockservice/LockParse.cpp	2002-08-30
09:09:06.000000000 -0500
+++ cvsnt-1.11.1.3.new/lockservice/LockParse.cpp	2002-10-22
12:19:23.000000000 -0500
@@ -15,6 +15,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <cstdarg>

 using namespace std;

@@ -214,7 +215,7 @@
 			DEBUG("(#%d) Destroying lock on %s\n",s,LockList[n].path.c_str());
 			LockList[n].flags=lfDeleted;
 			MonitorUpdateLock(n);
-			LockList.erase(&LockList[n]);
+			LockList.erase(LockList.begin()+n);
 		}
 		else
 			n++;
@@ -427,7 +428,7 @@
 			DEBUG("(#%d) Unlocking %s\n",s,LockList[n].path.c_str());
 			LockList[n].flags=lfDeleted;
 			MonitorUpdateLock(n);
-			LockList.erase(&LockList[n]);
+			LockList.erase(LockList.begin()+n);
 			bUnlocked = true;
 		}
 		else
diff -u -x'*.o' -x.deps cvsnt-1.11.1.3/lockservice/server.cpp
cvsnt-1.11.1.3.new/lockservice/server.cpp
--- cvsnt-1.11.1.3/lockservice/server.cpp	2002-08-30
07:27:58.000000000 -0500
+++ cvsnt-1.11.1.3.new/lockservice/server.cpp	2002-10-22
12:20:32.000000000 -0500
@@ -20,6 +20,7 @@
 #define closesocket close
 #endif

+#include <cstdarg>
 #include <vector>

 #include "LockService.h"
@@ -241,7 +242,7 @@
 		// Cleanup any closed sockets
 		for(n=g_Sockets.size()-1; n>0; --n)
 			if(g_Sockets[n].s==SOCKET_ERROR)
-				g_Sockets.erase(&g_Sockets[n]);
+				g_Sockets.erase(g_Sockets.begin()+n);
 	} while(!g_bStop);

 #ifdef _WIN32





More information about the cvsnt mailing list