Changeset 8284 for code/branches/kicklib2/src/libraries/network

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/libraries/network/LANDiscoverable.cc (modified) (1 diff)
• src/libraries/network/MasterServerComm.cc (modified) (1 diff)
• src/libraries/network/NetworkPrereqs.h (modified) (1 diff)

code/branches/kicklib2/src/libraries/network/LANDiscoverable.cc

@@ -29 +29 @@
 #include "LANDiscoverable.h"
 
-#include "NetworkPrereqs.h"
-#include "packet/ServerInformation.h"
-
 #include <enet/enet.h>
 #include <cassert>
 #include <cstring>
+
+#include "util/Debug.h"
+#include "packet/ServerInformation.h"
 
 namespace orxonox

code/branches/kicklib2/src/libraries/network/MasterServerComm.cc

@@ -28 +28 @@
 
 #include "MasterServerComm.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/kicklib2/src/libraries/network/NetworkPrereqs.h

@@ -52 +52 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _NetworkPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _NetworkExport  __attribute__ ((visibility("default")))
+#  define _NetworkPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _NetworkExport
+#  define _NetworkPrivate
 #endif