comparison system/System.h @ 742:c10cb8782576 coreaudio_tests

Merge from branch "default"
author Chris Cannam
date Sun, 01 Jul 2012 11:53:00 +0100
parents 06f13a3b9e9e
children 773f228f080d 001d77a720ce
comparison
equal deleted inserted replaced
666:4efa7429cd85 742:c10cb8782576
13 COPYING included with this distribution for more information. 13 COPYING included with this distribution for more information.
14 */ 14 */
15 15
16 #ifndef _SYSTEM_H_ 16 #ifndef _SYSTEM_H_
17 #define _SYSTEM_H_ 17 #define _SYSTEM_H_
18
19 #include "base/Debug.h"
18 20
19 #ifdef _WIN32 21 #ifdef _WIN32
20 22
21 #include <windows.h> 23 #include <windows.h>
22 #include <malloc.h> 24 #include <malloc.h>
57 extern "C" { 59 extern "C" {
58 void usleep(unsigned long usec); 60 void usleep(unsigned long usec);
59 int gettimeofday(struct timeval *p, void *tz); 61 int gettimeofday(struct timeval *p, void *tz);
60 } 62 }
61 63
62 #define ISNAN isnan 64 #define ISNAN _isnan
63 #define ISINF isinf 65 #define ISINF _isinf
64 66
65 #else 67 #else
66 68
67 #include <sys/mman.h> 69 #include <sys/mman.h>
68 #include <dlfcn.h> 70 #include <dlfcn.h>