Changeset 9347 in orxonox.OLD for branches/proxy/src/subprojects

Timestamp:

Jul 20, 2006, 11:43:27 AM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: merged the proxy.old back again, and it seems to work.

Merged with command
svn merge -r9247:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy.old .

no conflicts

Location:

branches/proxy/src/subprojects

Files:

• network/network_unit_test.cc (modified) (2 diffs)
• recapture_mouse (copied) (copied from branches/proxy.old/src/subprojects/recapture_mouse)
• recapture_mouse/Makefile.am (copied) (copied from branches/proxy.old/src/subprojects/recapture_mouse/Makefile.am)
• recapture_mouse/recapturer.cc (copied) (copied from branches/proxy.old/src/subprojects/recapture_mouse/recapturer.cc)

branches/proxy/src/subprojects/network/network_unit_test.cc

@@ -208 +208 @@
 
   /* esatblish a connection */
-  IPaddress ip;
+  IP ip;
   int error = SDLNet_ResolveHost(&ip, "127.0.0.1", port);
   //SDLNet_ResolveHost(&ip, "localhost", port);
@@ -353 +353 @@
   printf("Connecting to %s, on port %i\n", name, port);
 
-  IPaddress ip;
+  IP ip;
   int error = SDLNet_ResolveHost(&ip, name, port);
   if(error == -1)