remove stuff for ccrtp patching and solution file too.
git-svn-id: http://svn.freeswitch.org/svn/local/src/freeswitch@36 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
parent
c9117dc47b
commit
f7ac01ce60
|
|
@ -9,14 +9,14 @@ set INCLUDEDIR=%BASEDIR%\include
|
|||
set LIBSRCDIR=%BASEDIR%\src
|
||||
set DEBUGLIBBINDIR=%BASEDIR%\debuglib
|
||||
set WGET=cscript %UTILSDIR%\wget.vbs
|
||||
set PATCHURL=http://www.jerris.com/
|
||||
SET PATCHTAR=patch.tar.gz
|
||||
REM set PATCHURL=http://www.jerris.com/
|
||||
REM SET PATCHTAR=patch.tar.gz
|
||||
set TAR=%UTILSDIR%\tar.exe
|
||||
set TARURL=http://users.pandora.be/larc/download/windows_management/tar.exe
|
||||
set GUNZIP=%UTILSDIR%\gunzip.exe
|
||||
set GUNZIPURL=http://users.pandora.be/larc/download/windows_management/gunzip.exe
|
||||
set UNIX2DOS=%UTILSDIR%\unix2dos.vbs
|
||||
set PATCH=%UTILSDIR%\PATCH.exe
|
||||
REM set PATCH=%UTILSDIR%\PATCH.exe
|
||||
set APRDIR=apr-1.2.2
|
||||
set APRTAR=%APRDIR%.tar.gz
|
||||
set APRURL=ftp://ftp.wayne.edu/apache/apr/
|
||||
|
|
@ -49,9 +49,9 @@ ECHO ****************************************************************
|
|||
|
||||
IF NOT EXIST %TAR% %WGET% %TARURL% %UTILSDIR%
|
||||
IF NOT EXIST %GUNZIP% %WGET% %GUNZIPURL% %UTILSDIR%
|
||||
cd %UTILSDIR%
|
||||
IF NOT EXIST %UTILSDIR%\%PATCHTAR% IF NOT EXIST %PATCH% %WGET% %PATCHURL%%PATCHTAR% %UTILSDIR% & %GUNZIP% < %UTILSDIR%\%PATCHTAR% | %TAR% xvf - & del %PATCHTAR%
|
||||
cd %LIBSRCDIR%
|
||||
REM cd %UTILSDIR%
|
||||
REM IF NOT EXIST %UTILSDIR%\%PATCHTAR% IF NOT EXIST %PATCH% %WGET% %PATCHURL%%PATCHTAR% %UTILSDIR% & %GUNZIP% < %UTILSDIR%\%PATCHTAR% | %TAR% xvf - & del %PATCHTAR%
|
||||
REM cd %LIBSRCDIR%
|
||||
|
||||
IF NOT EXIST %APRTAR% IF NOT EXIST %APRDESTDIR% %WGET% %APRURL%%APRTAR% & %GUNZIP% < %APRTAR% | %TAR% xvf - & ren %APRDIR% %APRDESTDIR% & del %APRTAR%
|
||||
REM IF NOT EXIST %CCRTPTAR% IF NOT EXIST %CCRTPDESTDIR% %WGET% %CCRTPURL%%CCRTPTAR% & %GUNZIP% < %CCRTPTAR% | %TAR% xvf - & ren %CCRTPDIR% %CCRTPDESTDIR% & del %CCRTPTAR%
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 9.00
|
||||
# Visual Studio 2005
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccext2", "..\common\ccext2.vcproj", "{BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{38CADFB3-E363-4B5C-9BA3-F77321211B9D} = {38CADFB3-E363-4B5C-9BA3-F77321211B9D}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccgnu2", "..\common\ccgnu2.vcproj", "{38CADFB3-E363-4B5C-9BA3-F77321211B9D}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccrtp1", "ccrtp1.vcproj", "{3C266BF0-3EDE-4A83-8D10-E254456F7CDF}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{38CADFB3-E363-4B5C-9BA3-F77321211B9D} = {38CADFB3-E363-4B5C-9BA3-F77321211B9D}
|
||||
{BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29} = {BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Release|Win32 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{BDCDCE59-1DBA-48A9-A6F4-00C6E8528A29}.Release|Win32.Build.0 = Release|Win32
|
||||
{38CADFB3-E363-4B5C-9BA3-F77321211B9D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{38CADFB3-E363-4B5C-9BA3-F77321211B9D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{38CADFB3-E363-4B5C-9BA3-F77321211B9D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{38CADFB3-E363-4B5C-9BA3-F77321211B9D}.Release|Win32.Build.0 = Release|Win32
|
||||
{3C266BF0-3EDE-4A83-8D10-E254456F7CDF}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{3C266BF0-3EDE-4A83-8D10-E254456F7CDF}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{3C266BF0-3EDE-4A83-8D10-E254456F7CDF}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{3C266BF0-3EDE-4A83-8D10-E254456F7CDF}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
--- 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));
|
||||
Loading…
Reference in New Issue