Bug 757593: Fix build error. _MD_INTERVAL_INIT used to be defined in

_unixos.h. Now it needs to be defined in this file for Solaris. Remove an
unnecessary #ifndef _PR_PTHREADS test and redundant PRIntervalTime
function declarations and macro definitions in the
#if !defined(_PR_PTHREADS) part of the file. TBR=kaie.


git-svn-id: svn://10.0.0.236/trunk@264382 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2012-10-25 14:54:24 +00:00
parent 2aaca5429e
commit 0ef1cd08dc

View File

@ -110,6 +110,7 @@ struct _md_sockaddr_in6 {
#endif
#include "prinrval.h"
#define _MD_INTERVAL_INIT()
NSPR_API(PRIntervalTime) _MD_Solaris_GetInterval(void);
#define _MD_GET_INTERVAL _MD_Solaris_GetInterval
NSPR_API(PRIntervalTime) _MD_Solaris_TicksPerSecond(void);
@ -439,9 +440,7 @@ struct _MDCPU {
struct _MDCPU_Unix md_unix;
};
#ifndef _PR_PTHREADS
#define _MD_INIT_LOCKS()
#endif
#define _MD_NEW_LOCK(lock) PR_SUCCESS
#define _MD_FREE_LOCK(lock)
#define _MD_LOCK(lock)
@ -467,11 +466,6 @@ extern PRStatus _MD_CREATE_THREAD(PRThread *thread, void (*start) (void *),
PRThreadPriority priority, PRThreadScope scope, PRThreadState state,
PRUint32 stackSize);
NSPR_API(PRIntervalTime) _MD_Solaris_GetInterval(void);
#define _MD_GET_INTERVAL _MD_Solaris_GetInterval
NSPR_API(PRIntervalTime) _MD_Solaris_TicksPerSecond(void);
#define _MD_INTERVAL_PER_SEC _MD_Solaris_TicksPerSecond
/* The following defines the unwrapped versions of select() and poll(). */
extern int _select(int nfds, fd_set *readfds, fd_set *writefds,
fd_set *exceptfds, struct timeval *timeout);