< Previous by Date Date Index Next by Date >
  Thread Index Next in Thread >

[reSIProcate] Patches to main HEAD to build on Visual Studio 2005


Attached is the following patches:
 
-Replace bzero() with memset() because VS2005 does not support this function.  memset() is portable.
-Remove FlowID.cxx and FlowID.hxx from resiprocate project file.
-Add InteropHelper.cxx and InteropHelper.hxx to resiprocate project file.
-Add ClientAuthExtension.cxx and ClientAuthExtension.hxx to dum project file.
 
However, even with all of this, I can not successfully build because the

RequestContext.

setTargetConnection() member function was removed from the class definition previously and it is still being called in

SetTargetConnection.cxx

 

David Suh

 

Index: resip/dum/dum_8_0.vcproj
===================================================================
--- resip/dum/dum_8_0.vcproj    (revision 7492)
+++ resip/dum/dum_8_0.vcproj    (working copy)
@@ -325,6 +325,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\ClientAuthExtension.cxx"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\ClientAuthManager.cxx"
                                >
                        </File>
@@ -619,6 +623,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\ClientAuthExtension.hxx"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\ClientAuthManager.hxx"
                                >
                        </File>
Index: resip/stack/resiprocate_8_0.vcproj
===================================================================
--- resip/stack/resiprocate_8_0.vcproj  (revision 7492)
+++ resip/stack/resiprocate_8_0.vcproj  (working copy)
@@ -415,10 +415,6 @@
                                >
                        </File>
                        <File
-                               RelativePath=".\FlowId.cxx"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\GenericContents.cxx"
                                >
                        </File>
@@ -463,6 +459,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\InteropHelper.cxx"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\InterruptableStackThread.cxx"
                                >
                        </File>
@@ -932,10 +932,6 @@
                                >
                        </File>
                        <File
-                               RelativePath=".\FlowId.hxx"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\GenericContents.hxx"
                                >
                        </File>
@@ -980,6 +976,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\InteropHelper.hxx"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\InterruptableStackThread.hxx"
                                >
                        </File>
Index: resip/stack/test/testSource.cxx
===================================================================
--- resip/stack/test/testSource.cxx     (revision 7492)
+++ resip/stack/test/testSource.cxx     (working copy)
@@ -31,7 +31,7 @@
 
    sockfd = socket(AF_INET, SOCK_DGRAM, 0);
 
-   bzero(&servaddr, sizeof(servaddr));
+   memset(&servaddr, 0, sizeof(servaddr));
    servaddr.sin_family = AF_INET;
    const int serv_port = 9999;
    servaddr.sin_port = htons(9999);
Index: resip/stack/Tuple.cxx
===================================================================
--- resip/stack/Tuple.cxx       (revision 7492)
+++ resip/stack/Tuple.cxx       (working copy)
@@ -218,7 +218,7 @@
    // V6: sin6_len(1), sin6_flowinfo(4), flowId(4), 
onlyUseExistingConnection(1)
    // V4: sin_family(2 instead of 1), sin_zero(8), flowId(4), 
onlyUseExistingConnection(1)
    UInt32 rawToken[6];
-   bzero(&rawToken, 24);
+   memset(&rawToken, 0, 24);
 
    rawToken[0] = tuple.mFlowKey;