[TeamTalk 334]: [870] trunk/TeamTalk/Libraries: Use _WIN32 macro instead of WIN32.
tk@edam.speech.cs.cmu.edu
tk at edam.speech.cs.cmu.edu
Thu Nov 8 17:05:44 EST 2007
An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071108/9db316bc/attachment.html
-------------- next part --------------
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/PrimitiveComm.vcproj
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/PrimitiveComm.vcproj 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/PrimitiveComm.vcproj 2007-11-08 22:05:43 UTC (rev 870)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;../boeingLib/boeing;../boeingLib/coralshared"
- PreprocessorDefinitions="_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG"
+ PreprocessorDefinitions="_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -92,7 +92,6 @@
>
<Tool
Name="VCPreBuildEventTool"
- Description=""
CommandLine=""
/>
<Tool
@@ -110,7 +109,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".;../boeingLib/boeing;../boeingLib/coralshared"
- PreprocessorDefinitions="_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG"
+ PreprocessorDefinitions="_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
RuntimeLibrary="2"
StructMemberAlignment="2"
RuntimeTypeInfo="true"
@@ -293,6 +292,10 @@
>
</File>
<File
+ RelativePath="..\boeingLib\coralshared\timer.h"
+ >
+ </File>
+ <File
RelativePath=".\udpsocket.h"
>
</File>
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/netutils.cpp
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/netutils.cpp 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/netutils.cpp 2007-11-08 22:05:43 UTC (rev 870)
@@ -17,13 +17,13 @@
lpMsgBuf[e.size()] = '\0';
}
-#ifdef WIN32
+#ifdef _WIN32
NetUtilsException::NetUtilsException(DWORD errorCode) throw()
#else
NetUtilsException::NetUtilsException() throw()
#endif
{
-#ifdef WIN32
+#ifdef _WIN32
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
NULL,
errorCode,
@@ -48,7 +48,7 @@
string NetUtilsException::what() throw() {return lpMsgBuf;}
void initializeSockets(struct fd_set* sockets) {
-#ifdef WIN32
+#ifdef _WIN32
WORD wVersionRequested;
WSADATA wsaData;
int err;
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/netutils.h
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/netutils.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/netutils.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -1,7 +1,7 @@
#ifndef NETUTILS_H
#define NETUTILS_H
-#ifdef WIN32
+#ifdef _WIN32
#include <Winsock2.h>
#else
#include <sys/types.h>
@@ -20,7 +20,7 @@
char* lpMsgBuf;
public:
NetUtilsException(const string& e) throw();
-#ifdef WIN32
+#ifdef _WIN32
NetUtilsException(DWORD errorCode=WSAGetLastError()) throw();
#else
NetUtilsException() throw();
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_client.cpp
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/robot_client.cpp 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_client.cpp 2007-11-08 22:05:43 UTC (rev 870)
@@ -1,4 +1,4 @@
-#ifdef WIN32
+#ifdef _WIN32
#include <float.h>
#else
#include <math.h>
@@ -14,7 +14,7 @@
#include <fstream>
#include <sstream>
-#ifdef WIN32
+#ifdef _WIN32
#include <process.h>
typedef int socklen_t;
#else
@@ -37,7 +37,7 @@
void RobotClient::spawnServer()
{
//spawn server
-#ifdef WIN32
+#ifdef _WIN32
serverThread_ = (HANDLE)_beginthread(readMessages, 0, (void*)this);
_beginthread(trackbots, 0, (void*)this);
#else
@@ -47,7 +47,7 @@
#endif
}
-#ifdef WIN32
+#ifdef _WIN32
void RobotClient::trackbots(void* thisp)
#else
void* RobotClient::trackbots(void* thisp)
@@ -77,7 +77,7 @@
//---------------------------
// receiving messages
-#ifdef WIN32
+#ifdef _WIN32
void RobotClient::readMessages(void *thisp)
#else
void* RobotClient::readMessages(void *thisp)
@@ -146,7 +146,7 @@
void RobotClient::wait() const
{
-#ifdef WIN32
+#ifdef _WIN32
WaitForSingleObject(serverThread_, INFINITE);
#else
pthread_join(serverThread_, NULL);
@@ -170,14 +170,14 @@
{
// issue: close recieve thread somehow?
-#ifdef WIN32
+#ifdef _WIN32
WSACleanup();
#endif
}
void RobotsClient::initializeSocketLayer()
{
-#ifdef WIN32
+#ifdef _WIN32
initializeSockets();
#endif
}
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_client.hpp
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/robot_client.hpp 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_client.hpp 2007-11-08 22:05:43 UTC (rev 870)
@@ -1,7 +1,7 @@
#ifndef __ROBOT_CLIENT_H__
#define __ROBOT_CLIENT_H__
-#ifdef WIN32
+#ifdef _WIN32
#include <Winsock2.h>
#else
#include <sys/types.h>
@@ -59,7 +59,7 @@
protected:
bool connect(); //returns true if connection succeeded
void spawnServer();
-#ifdef WIN32
+#ifdef _WIN32
static void trackbots(void *thisp);
static void readMessages(void *thisp);
HANDLE serverThread_;
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp 2007-11-08 22:05:43 UTC (rev 870)
@@ -210,7 +210,7 @@
void Msg::stamp(Boeing::MsgHeader& h)
{
-#ifdef WIN32
+#ifdef _WIN32
struct __timeb64 timebuffer;
_ftime64(&timebuffer);
#else
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_server.cpp
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/robot_server.cpp 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_server.cpp 2007-11-08 22:05:43 UTC (rev 870)
@@ -1,4 +1,4 @@
-#ifdef WIN32
+#ifdef _WIN32
#include <float.h>
#else
#include <math.h>
@@ -12,7 +12,7 @@
#include <fstream>
#include <sstream>
-#ifdef WIN32
+#ifdef _WIN32
#include <process.h>
typedef int socklen_t;
#else
@@ -49,7 +49,7 @@
{
// issue: close recieve thread somehow?
-#ifdef WIN32
+#ifdef _WIN32
WSACleanup();
#endif
}
@@ -62,13 +62,13 @@
strncpy(hostname, inet_ntoa(me), Boeing::SADDR_LENGTH);
}
-#ifdef WIN32
+#ifdef _WIN32
HANDLE RobotServer::spawnServer() {
#else
pthread_t RobotServer::spawnServer() {
#endif
//spawn server
-#ifdef WIN32
+#ifdef _WIN32
//_beginthread(keepalive, 0, (void *) this);
return (HANDLE)_beginthread(readMessages, 0, (void *) this);
#else
@@ -92,7 +92,7 @@
//---------------------------
// receiving messages
-#ifdef WIN32
+#ifdef _WIN32
void RobotServer::readMessages(void *thisp)
#else
void* RobotServer::readMessages(void *thisp)
@@ -134,7 +134,7 @@
}
void RobotServer::wait() const {
-#ifdef WIN32
+#ifdef _WIN32
WaitForSingleObject(serverThread_, INFINITE);
#else
pthread_join(serverThread_, NULL);
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_server.hpp
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/robot_server.hpp 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_server.hpp 2007-11-08 22:05:43 UTC (rev 870)
@@ -3,7 +3,7 @@
// client class to manage UDP connections to robots
-#ifdef WIN32
+#ifdef _WIN32
#include <Winsock2.h>
#include "win32dep.h"
#else
@@ -53,7 +53,7 @@
char ip[16]; // our ip address in presentation format
string handle_; //our handle
-#ifdef WIN32
+#ifdef _WIN32
static void readMessages(void *thisp);
//static void keepalive(void *thisp);
HANDLE serverThread_;
@@ -70,7 +70,7 @@
protected:
//void initializeSockets();
void getMyAddress();
-#ifdef WIN32
+#ifdef _WIN32
HANDLE spawnServer();
#else
pthread_t spawnServer();
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc 2007-11-08 22:05:43 UTC (rev 870)
@@ -9,7 +9,7 @@
/* LICENSE: */
-#ifdef WIN32
+#ifdef _WIN32
typedef int socklen_t;
#endif
@@ -25,7 +25,7 @@
#include <assert.h>
-#ifndef WIN32
+#ifndef _WIN32
#include <unistd.h>
#include <sys/time.h>
#endif
@@ -94,7 +94,7 @@
double UDPSocket::getTime()
{
-#ifdef WIN32
+#ifdef _WIN32
struct __timeb64 timebuffer;
_ftime64(&timebuffer);
return timebuffer.time + (float)timebuffer.millitm/1000;
@@ -139,7 +139,7 @@
return status;
}
-#ifndef WIN32
+#ifndef _WIN32
int flags = fcntl(fd, F_GETFD);
fcntl(fd, F_SETFD, flags|FD_CLOEXEC);
#endif
@@ -176,7 +176,7 @@
if (connect(fd, (struct sockaddr*) &serv_addr, sizeof(serv_addr)) < 0) {
perror("connect");
-#ifdef WIN32
+#ifdef _WIN32
closesocket(fd);
#else
close(fd);
@@ -200,7 +200,7 @@
int UDPSocket::disconnect()
{
if (status > 0) {
-#ifdef WIN32
+#ifdef _WIN32
closesocket(fd);
#else
close(fd);
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -16,7 +16,7 @@
#include <errno.h>
#include <fcntl.h>
-#ifdef WIN32
+#ifdef _WIN32
#include <Winsock2.h>
#include <sys/timeb.h>
#else
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/utils.cpp
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/utils.cpp 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/utils.cpp 2007-11-08 22:05:43 UTC (rev 870)
@@ -1,4 +1,4 @@
-#ifdef WIN32
+#ifdef _WIN32
#include <direct.h>
#else
#include <sys/types.h>
@@ -137,7 +137,7 @@
}
}
-#ifndef WIN32
+#ifndef _WIN32
int spawn(bool wait, const string& working_dir, const string& cmd, vector<string> args)
{
char** argv = new char*[args.size()+2];
@@ -232,7 +232,7 @@
bool testLastConfig(const string& source, const string& target)
{
//return true if target is newer than source
-#ifdef WIN32
+#ifdef _WIN32
struct _stat source_stat, target_stat;
if(_stat(source.c_str(), &source_stat)) {
#else
@@ -242,7 +242,7 @@
error << "problem stating source: " << source << endl;
return false;
}
-#ifdef WIN32
+#ifdef _WIN32
if(_stat(target.c_str(), &target_stat)) {
#else
if(stat(target.c_str(), &target_stat)) {
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/utils.h
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/utils.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/utils.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -12,7 +12,7 @@
* - Filesystem
*/
-#ifdef WIN32
+#ifdef _WIN32
#include <winsock2.h>
#include <Windows.h>
#include <process.h>
@@ -121,7 +121,7 @@
// ** Process *********************************************************
-#ifndef WIN32
+#ifndef _WIN32
int spawn(bool wait, const string& wdir, const string& cmd,
vector<string> args=vector<string>());
int spawn(bool wait, const string& title, const string& wdir,
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_client.cc
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_client.cc 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_client.cc 2007-11-08 22:05:43 UTC (rev 870)
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <string.h>
-#ifndef WIN32
+#ifndef _WIN32
#include <unistd.h>
#endif
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_packet.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_packet.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_packet.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -15,11 +15,11 @@
namespace Boeing {
#endif
-#ifdef WIN32
+#ifdef _WIN32
#pragma pack(1)
#endif
#ifndef PACKED
-#ifdef WIN32
+#ifdef _WIN32
#define PACKED
#else
#define PACKED __attribute__((packed))
@@ -153,7 +153,7 @@
unsigned char buff[sizeof(MsgMap)+sizeof(int)*2000*2000];
} PACKED;
-#ifdef WIN32
+#ifdef _WIN32
// reset packing....
#pragma pack()
#endif
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc 2007-11-08 22:05:43 UTC (rev 870)
@@ -1,4 +1,4 @@
-#ifndef WIN32
+#ifndef _WIN32
#include <unistd.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -81,7 +81,7 @@
if (!sock->isConnected())
return (NULL);
- // fprintf(stderr,"%s:4 0x%x \n",__FUNCTION__,addr);
+ //fprintf(stderr,"%s:4 0x%x \n",__FUNCTION__,addr);
// receive the header...
int rv = sock->recv(rxdata.buff,sizeof(rxdata),addr);
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -5,7 +5,7 @@
#ifndef __BOEING_MAP_SERVER_H__
#define __BOEING_MAP_SERVER_H__
-#ifndef WIN32
+#ifndef _WIN32
#include <netinet/in.h>
#else
#include <winsock2.h>
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_net.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_net.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_net.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -11,12 +11,12 @@
namespace Boeing {
#endif
-#ifdef WIN32
+#ifdef _WIN32
#pragma pack(1)
#endif
#ifndef PACKED
-#ifdef WIN32
+#ifdef _WIN32
#define PACKED
#else
#define PACKED __attribute__((packed))
@@ -24,7 +24,7 @@
#endif
#ifndef SOCKET
-#ifndef WIN32
+#ifndef _WIN32
#define SOCKET int
#endif
#endif
@@ -79,7 +79,7 @@
inline int hasFailed(int v) { return v<=FAILED; }
-#ifdef WIN32
+#ifdef _WIN32
// reset packing....
#pragma pack()
#endif
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.cc
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.cc 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_client.cc 2007-11-08 22:05:43 UTC (rev 870)
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
-#ifndef WIN32
+#ifndef _WIN32
#include <unistd.h>
#else
#define isfinite(x) (true) //hack! isfinite is in C99 but not C90, msc++ doesn't quite do C99
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -15,11 +15,11 @@
#endif
/// required for compilation under Win32 and linux
-#ifdef WIN32
+#ifdef _WIN32
#pragma pack(1)
#endif
#ifndef PACKED
-#ifdef WIN32
+#ifdef _WIN32
#define PACKED
#else
#define PACKED __attribute__((packed))
@@ -306,7 +306,7 @@
char buff[50000];
} PACKED;
-#ifdef WIN32
+#ifdef _WIN32
// reset packing....
#pragma pack()
#endif
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.cc
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.cc 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.cc 2007-11-08 22:05:43 UTC (rev 870)
@@ -2,7 +2,7 @@
Boeing robot server ==
*/
-#ifndef WIN32
+#ifndef _WIN32
#include <unistd.h>
#endif
#include <stdarg.h>
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_server.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -7,7 +7,7 @@
#include <stdint.h>
-#ifdef WIN32
+#ifdef _WIN32
#else
//#include "geometry.h"
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_trader_client.cc
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_trader_client.cc 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_trader_client.cc 2007-11-08 22:05:43 UTC (rev 870)
@@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>
//#include <string>
-#ifndef WIN32
+#ifndef _WIN32
#include <unistd.h>
#endif
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_trader_packet.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_trader_packet.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_trader_packet.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -14,7 +14,7 @@
#endif
#ifndef PACKED
-#ifdef WIN32
+#ifdef _WIN32
#pragma pack(1)
#define PACKED
#else
@@ -88,7 +88,7 @@
char buff[1];
} PACKED;
-#ifdef WIN32
+#ifdef _WIN32
// reset packing....
#pragma pack()
#endif
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_trader_server.cc
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_trader_server.cc 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_trader_server.cc 2007-11-08 22:05:43 UTC (rev 870)
@@ -1,4 +1,4 @@
-#ifndef WIN32
+#ifndef _WIN32
#include <unistd.h>
#endif
#include <stdarg.h>
Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/timer.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/coralshared/timer.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/coralshared/timer.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -18,7 +18,7 @@
#include <string.h>
#include <time.h>
-#ifndef WIN32
+#ifndef _WIN32
#include <sys/time.h>
#include <unistd.h>
#else
Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/win32dep.cc
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/coralshared/win32dep.cc 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/coralshared/win32dep.cc 2007-11-08 22:05:43 UTC (rev 870)
@@ -1,4 +1,4 @@
-#ifdef WIN32
+#ifdef _WIN32
#include "win32dep.h"
Modified: trunk/TeamTalk/Libraries/boeingLib/coralshared/win32dep.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/coralshared/win32dep.h 2007-11-08 22:05:23 UTC (rev 869)
+++ trunk/TeamTalk/Libraries/boeingLib/coralshared/win32dep.h 2007-11-08 22:05:43 UTC (rev 870)
@@ -1,7 +1,7 @@
#ifndef __WIN32DEP_H__
#define __WIN32DEP_H__
-#ifdef WIN32
+#ifdef _WIN32
// win32 dependencies
More information about the TeamTalk-developers
mailing list