Mercurial > hg > svcore
changeset 710:773f228f080d library_integration
Changed ISINF in system/System.h for win32 compilation:
#define ISINF std::isinf //mathieub: replace with _isinf for osx compilation
| author | mathieub <mathieu.barthet@eecs.qmul.ac.uk> |
|---|---|
| date | Mon, 10 Oct 2011 17:27:08 +0100 |
| parents | 8c410ad4aa97 |
| children | 45e3ba1d5a1f b5daf8fc05ba |
| files | system/System.h |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/system/System.h Tue Aug 23 12:05:57 2011 +0100 +++ b/system/System.h Mon Oct 10 17:27:08 2011 +0100 @@ -57,12 +57,12 @@ #define getpid _getpid extern "C" { -void usleep(unsigned long usec); +//void usleep(unsigned long usec); //uncomment for osx compilation int gettimeofday(struct timeval *p, void *tz); } #define ISNAN _isnan -#define ISINF _isinf +#define ISINF std::isinf //replace with _isinf for osx compilation #else