From ce6068b65ad7d26a0a52907deedfa37a6c035ff3 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 4 Jun 2010 19:55:42 +0000 Subject: [PATCH] added #defines for win32 --- source/shared_lib/sources/platform/posix/socket.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp index 11f9b9f44..62489ecc5 100644 --- a/source/shared_lib/sources/platform/posix/socket.cpp +++ b/source/shared_lib/sources/platform/posix/socket.cpp @@ -1761,7 +1761,13 @@ float Socket::getAveragePingMS(std::string host, int pingCount) { sprintf(szCmd,"ping -c %d %s",pingCount,host.c_str()); #endif if(szCmd[0] != '\0') { +#ifdef _popen + FILE *ping= _popen(szCmd, "r"); +#elif defined popen FILE *ping= popen(szCmd, "r"); +#else + FILE *ping=NULL; +#endif if (ping != NULL){ char buf[4000]=""; int bufferPos = 0; @@ -1769,7 +1775,11 @@ float Socket::getAveragePingMS(std::string host, int pingCount) { char *data = fgets(&buf[bufferPos], 256, ping); bufferPos = strlen(buf); } +#ifdef _pclose + _pclose(ping); +#elif defined popen pclose(ping); +#endif if(debugPingOutput) printf("Running cmd [%s] got [%s]\n",szCmd,buf);