Another fix in systemdeps.h and types.h: jack_time_t now uniquely defined in types.h.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3334 0c269be4-1314-0410-8aa9-9f06e86f4224
This commit is contained in:
parent
f70dd81b9d
commit
136ba3bb13
53
systemdeps.h
53
systemdeps.h
|
@ -22,36 +22,34 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
#ifdef _MSC_VER /* Microsoft compiler */
|
#ifdef _MSC_VER /* Microsoft compiler */
|
||||||
#define __inline__ inline
|
#define __inline__ inline
|
||||||
#ifndef int8_t
|
#ifndef int8_t
|
||||||
typedef char int8_t;
|
typedef char int8_t;
|
||||||
typedef unsigned char uint8_t;
|
typedef unsigned char uint8_t;
|
||||||
typedef short int16_t;
|
typedef short int16_t;
|
||||||
typedef unsigned short uint16_t;
|
typedef unsigned short uint16_t;
|
||||||
typedef long int32_t;
|
typedef long int32_t;
|
||||||
typedef unsigned long uint32_t;
|
typedef unsigned long uint32_t;
|
||||||
typedef LONGLONG int64_t;
|
typedef LONGLONG int64_t;
|
||||||
typedef ULONGLONG uint64_t;
|
typedef ULONGLONG uint64_t;
|
||||||
#endif
|
#endif
|
||||||
#ifndef pthread_t
|
#ifndef pthread_t
|
||||||
typedef HANDLE pthread_t;
|
typedef HANDLE pthread_t;
|
||||||
#endif
|
#endif
|
||||||
#elif __MINGW32__ /* MINGW */
|
#elif __MINGW32__ /* MINGW */
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <sys/types.h>
|
|
||||||
#ifndef pthread_t
|
|
||||||
typedef HANDLE pthread_t;
|
|
||||||
#endif
|
|
||||||
#else /* other compilers ...*/
|
|
||||||
#include <inttypes.h>
|
|
||||||
#include <pthread.h>
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#endif
|
#ifndef pthread_t
|
||||||
|
typedef HANDLE pthread_t;
|
||||||
typedef int64_t _jack_time_t;
|
#endif
|
||||||
|
#else /* other compilers ...*/
|
||||||
|
#include <inttypes.h>
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* WIN32 */
|
#endif /* WIN32 */
|
||||||
|
|
||||||
|
@ -59,7 +57,6 @@ typedef int64_t _jack_time_t;
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
typedef uint64_t _jack_time_t;
|
|
||||||
#endif /* __APPLE__ || __linux__ || __sun__ || sun */
|
#endif /* __APPLE__ || __linux__ || __sun__ || sun */
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue