Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 367 for code/branches/FICN/src


Ignore:
Timestamp:
Dec 2, 2007, 6:06:48 PM (17 years ago)
Author:
rgrieder
Message:
  • made certain files windows compatible
  • solved conflict with unresolved external symbol registerAllVariables() by commenting call
Location:
code/branches/FICN
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN

    • Property svn:ignore

      •  

        old new  
        55FICN.suo
        66obj
         7dummy_client.vcproj.RGRIEDERT60.rgrieder.user
         8dummy_server.vcproj.RGRIEDERT60.rgrieder.user
         9FICN.vcproj.RGRIEDERT60.rgrieder.user
         10loader.vcproj.RGRIEDERT60.rgrieder.user
         11network.vcproj.RGRIEDERT60.rgrieder.user
         12orxonox_client.vcproj.RGRIEDERT60.rgrieder.user
         13orxonox_server.vcproj.RGRIEDERT60.rgrieder.user
         14FICN.suo
         15FICN.sln
         16FICN.ncb
         17benixonox.vcproj
         18core.vcproj
         19dummy_client.vcproj
         20dummy_server.vcproj
         21loader.vcproj
         22network.vcproj
         23orxonox_client.vcproj
         24orxonox_server.vcproj
         25benixonox.vcproj.RGRIEDERT60.rgrieder.user
         26core.vcproj.RGRIEDERT60.rgrieder.user

  • code/branches/FICN/src/network/PacketBufferTestExt.cc

    r355 r367  
    55#include "PacketBuffer.h"
    66#include "PacketBuffer.cc"
     7
     8#ifdef WIN32
     9#include <windows.h>
     10#define usleep(x) Sleep((x)/1000)
     11#else
     12#include <unistd.h>
     13#endif
    714
    815using namespace network;

  • code/branches/FICN/src/network/Synchronisable.cc

    r351 r367  
    2121{
    2222  datasize=0;
    23   registerAllVariables();
     23  //registerAllVariables();
    2424}
    2525

  • code/branches/FICN/src/network/dummyclient.cc

    r355 r367  
    88#include <enet/enet.h>
    99#include "PacketManager.h"
     10
     11#ifdef WIN32
     12#include <windows.h>
     13#define usleep(x) Sleep((x)/1000)
     14#else
     15#include <unistd.h>
     16#endif
    1017
    1118

  • code/branches/FICN/src/network/dummyserver.cc

    r355 r367  
    99#include "ConnectionManager.h"
    1010#include "PacketManager.h"
     11
     12#ifdef WIN32
     13#include <windows.h>
     14#define usleep(x) Sleep((x)/1000)
     15#else
     16#include <unistd.h>
     17#endif
    1118
    1219
    … …  
    2330  while(!quit){
    2431    if(server.queueEmpty())
    25 // Warning: usleep(100) under windows is ten times longer than with unix!
     32// Warning: usleep(100) is Sleep(100/1000) = Sleep(0), which is nothing!
    2633      usleep(100);
    2734    else{

  • code/branches/FICN/src/orxonox/core/Identifier.h

    r363 r367  
    88#include "Factory.h"
    99
     10#ifdef WIN32
     11#define HIERARCHY_VERBOSE 0
     12#else
    1013#define HIERARCHY_VERBOSE false
     14#endif
    1115
    1216
Note: See TracChangeset for help on using the changeset viewer.