Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated macro's for platform specific logic

Browse Source
This commit is contained in:
Mark Vejvoda 2010-06-04 20:26:15 +00:00
parent 3acc421404
commit d80a8850b6
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@ -584,21 +584,24 @@ void createDirectoryPaths(string Path)
{
//if (':' != *(path-1))
{
#if defined(_mkdir) || defined(WIN32)
#ifdef WIN32
_mkdir(DirName);
#elif defined(mkdir)
#elif defined(__GNUC__)
mkdir(DirName, S_IRWXO);
#else
#error "Your compiler needs to support mkdir!"
#endif
}
}
*dirName++ = *path++;
*dirName = '\0';
}
#if defined(_mkdir) || defined(WIN32)
#ifdef WIN32
_mkdir(DirName);
#elif defined(mkdir)
#elif defined(__GNUC__)
mkdir(DirName, S_IRWXO);
#else
#error "Your compiler needs to support mkdir!"
#endif
}

23
source/shared_lib/sources/platform/posix/socket.cpp
View File

@ -1753,19 +1753,27 @@ void BroadCastSocketThread::execute() {
float Socket::getAveragePingMS(std::string host, int pingCount) {
double result = -1;
const bool debugPingOutput = false;
const bool debugPingOutput = true;
char szCmd[1024]="";
#ifdef WIN32
sprintf(szCmd,"ping -n %d %s",pingCount,host.c_str());
#else
if(debugPingOutput) printf("WIN32 is defined\n");
#elif defined(__GNUC__)
sprintf(szCmd,"ping -c %d %s",pingCount,host.c_str());
if(debugPingOutput) printf("NON WIN32 is defined\n");
#else
#error "Your compiler needs to support popen!"
#endif
if(szCmd[0] != '\0') {
FILE *ping= NULL;
#if defined(_popen) || defined(WIN32)
#ifdef WIN32
ping= _popen(szCmd, "r");
#elif defined(popen)
if(debugPingOutput) printf("WIN32 style _popen\n");
#elif defined(__GNUC__)
ping= popen(szCmd, "r");
if(debugPingOutput) printf("POSIX style _popen\n");
#else
#error "Your compiler needs to support popen!"
#endif
if (ping != NULL){
char buf[4000]="";
@ -1774,10 +1782,13 @@ float Socket::getAveragePingMS(std::string host, int pingCount) {
char *data = fgets(&buf[bufferPos], 256, ping);
bufferPos = strlen(buf);
}
#if defined(_pclose) || defined(WIN32)
#ifdef WIN32
_pclose(ping);
#elif defined(pclose)
#elif defined(__GNUC__)
pclose(ping);
#else
#error "Your compiler needs to support popen!"
#endif
if(debugPingOutput) printf("Running cmd [%s] got [%s]\n",szCmd,buf);