set LIBSRCDIR=%BASEDIR%\src\r
set DEBUGLIBBINDIR=%BASEDIR%\debuglib\r
set WGET=cscript %UTILSDIR%\wget.vbs\r
-set PATCHURL=http://www.jerris.com/\r
-SET PATCHTAR=patch.tar.gz\r
+REM set PATCHURL=http://www.jerris.com/\r
+REM SET PATCHTAR=patch.tar.gz\r
set TAR=%UTILSDIR%\tar.exe\r
set TARURL=http://users.pandora.be/larc/download/windows_management/tar.exe\r
set GUNZIP=%UTILSDIR%\gunzip.exe\r
set GUNZIPURL=http://users.pandora.be/larc/download/windows_management/gunzip.exe\r
set UNIX2DOS=%UTILSDIR%\unix2dos.vbs\r
-set PATCH=%UTILSDIR%\PATCH.exe\r
+REM set PATCH=%UTILSDIR%\PATCH.exe\r
set APRDIR=apr-1.2.2\r
set APRTAR=%APRDIR%.tar.gz\r
set APRURL=ftp://ftp.wayne.edu/apache/apr/\r
\r
IF NOT EXIST %TAR% %WGET% %TARURL% %UTILSDIR%\r
IF NOT EXIST %GUNZIP% %WGET% %GUNZIPURL% %UTILSDIR%\r
-cd %UTILSDIR%\r
-IF NOT EXIST %UTILSDIR%\%PATCHTAR% IF NOT EXIST %PATCH% %WGET% %PATCHURL%%PATCHTAR% %UTILSDIR% & %GUNZIP% < %UTILSDIR%\%PATCHTAR% | %TAR% xvf - & del %PATCHTAR%\r
-cd %LIBSRCDIR%\r
+REM cd %UTILSDIR%\r
+REM IF NOT EXIST %UTILSDIR%\%PATCHTAR% IF NOT EXIST %PATCH% %WGET% %PATCHURL%%PATCHTAR% %UTILSDIR% & %GUNZIP% < %UTILSDIR%\%PATCHTAR% | %TAR% xvf - & del %PATCHTAR%\r
+REM cd %LIBSRCDIR%\r
\r
IF NOT EXIST %APRTAR% IF NOT EXIST %APRDESTDIR% %WGET% %APRURL%%APRTAR% & %GUNZIP% < %APRTAR% | %TAR% xvf - & ren %APRDIR% %APRDESTDIR% & del %APRTAR%\r
REM IF NOT EXIST %CCRTPTAR% IF NOT EXIST %CCRTPDESTDIR% %WGET% %CCRTPURL%%CCRTPTAR% & %GUNZIP% < %CCRTPTAR% | %TAR% xvf - & ren %CCRTPDIR% %CCRTPDESTDIR% & del %CCRTPTAR%\r
+++ /dev/null
-\r
-Microsoft Visual Studio Solution File, Format Version 9.00\r
-# Visual Studio 2005\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccext2", "..\common\ccext2.vcproj", "{BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}"\r
- ProjectSection(ProjectDependencies) = postProject\r
- {38CADFB3-E363-4B5C-9BA3-F77321211B9D} = {38CADFB3-E363-4B5C-9BA3-F77321211B9D}\r
- EndProjectSection\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccgnu2", "..\common\ccgnu2.vcproj", "{38CADFB3-E363-4B5C-9BA3-F77321211B9D}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccrtp1", "ccrtp1.vcproj", "{3C266BF0-3EDE-4A83-8D10-E254456F7CDF}"\r
- ProjectSection(ProjectDependencies) = postProject\r
- {38CADFB3-E363-4B5C-9BA3-F77321211B9D} = {38CADFB3-E363-4B5C-9BA3-F77321211B9D}\r
- {BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29} = {BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}\r
- EndProjectSection\r
-EndProject\r
-Global\r
- GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
- Debug|Win32 = Debug|Win32\r
- Release|Win32 = Release|Win32\r
- EndGlobalSection\r
- GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
- {BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}.Debug|Win32.ActiveCfg = Debug|Win32\r
- {BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}.Debug|Win32.Build.0 = Debug|Win32\r
- {BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}.Release|Win32.ActiveCfg = Release|Win32\r
- {BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}.Release|Win32.Build.0 = Release|Win32\r
- {38CADFB3-E363-4B5C-9BA3-F77321211B9D}.Debug|Win32.ActiveCfg = Debug|Win32\r
- {38CADFB3-E363-4B5C-9BA3-F77321211B9D}.Debug|Win32.Build.0 = Debug|Win32\r
- {38CADFB3-E363-4B5C-9BA3-F77321211B9D}.Release|Win32.ActiveCfg = Release|Win32\r
- {38CADFB3-E363-4B5C-9BA3-F77321211B9D}.Release|Win32.Build.0 = Release|Win32\r
- {3C266BF0-3EDE-4A83-8D10-E254456F7CDF}.Debug|Win32.ActiveCfg = Debug|Win32\r
- {3C266BF0-3EDE-4A83-8D10-E254456F7CDF}.Debug|Win32.Build.0 = Debug|Win32\r
- {3C266BF0-3EDE-4A83-8D10-E254456F7CDF}.Release|Win32.ActiveCfg = Release|Win32\r
- {3C266BF0-3EDE-4A83-8D10-E254456F7CDF}.Release|Win32.Build.0 = Release|Win32\r
- EndGlobalSection\r
- GlobalSection(SolutionProperties) = preSolution\r
- HideSolutionNode = FALSE\r
- EndGlobalSection\r
-EndGlobal\r
+++ /dev/null
---- thread.cpp.bak 2005-07-19 08:16:10.000000000 -0400
-+++ thread.cpp 2005-11-14 13:04:59.200854500 -0500
-@@ -1758,14 +1758,16 @@
- int SysTime::getTimeOfDay(struct timeval *tp)
- {
- struct timeval temp;
-- int ret(0);
-+ time_t now;
-+ int ret(0);
- lock();
-
- #ifdef WIN32
- // We could use _ftime(), but it is not available on WinCE.
- // (WinCE also lacks time.h)
- // Note also that the average error of _ftime is around 20 ms :)
-- time(&temp.tv_sec);
-+ time(&now);
-+ temp.tv_sec = (long) now;
- temp.tv_usec = (GetTickCount() % 1000) * 1000;
- memcpy(tp, &temp, sizeof(struct timeval));
- #else
---- lockfile.cpp.bak 2005-04-23 19:08:21.000000000 -0400
-+++ lockfile.cpp 2005-11-14 13:05:56.305244100 -0500
-@@ -68,7 +68,7 @@
- bool Lockfile::lock(const char *name)
- {
- char mname[65];
-- char *ext = strrchr(name, '/');
-+ char *ext = (char *) strrchr(name, '/');
-
- if(ext)
- name = ++ext;
---- socket.cpp.bak 2005-10-09 09:12:35.000000000 -0400
-+++ socket.cpp 2005-11-14 13:05:32.710375300 -0500
-@@ -1330,7 +1330,7 @@
- return;
- }
-
--#if defined(SO_REUSEADDR) && !defined(WIN32)
-+#if defined(SO_REUSEADDR) //&& !defined(WIN32)
- int opt = 1;
- setsockopt(so, SOL_SOCKET, SO_REUSEADDR, (char *)&opt,
- (socklen_t)sizeof(opt));