Merge Solaris branch back on trunk.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3306 0c269be4-1314-0410-8aa9-9f06e86f4224
This commit is contained in:
sletz 2009-02-11 12:31:20 +00:00 committed by Filipe Coelho
parent 9c0d8ff164
commit 1dea4f5411
1 changed files with 1 additions and 3 deletions

View File

@ -29,8 +29,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <sys/types.h>
#else
#define __inline__ inline
//#define vsnprintf _vsnprintf
//#define snprintf _snprintf
typedef char int8_t;
typedef unsigned char uint8_t;
typedef short int16_t;
@ -44,7 +42,7 @@ typedef HANDLE pthread_t;
typedef int64_t _jack_time_t;
#endif // WIN32 */
#if defined(__APPLE__) || defined(__linux__)
#if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun)
#include <inttypes.h>
#include <pthread.h>