diff options
author | wtc%google.com <devnull@localhost> | 2008-07-26 18:14:23 +0000 |
---|---|---|
committer | wtc%google.com <devnull@localhost> | 2008-07-26 18:14:23 +0000 |
commit | de7201513f7e04719584eef7136880bb1524e7ad (patch) | |
tree | 3d7cbaa5639fcb39edb7d82cf9a1d36979a61bba | |
parent | d26d7d8cb30a5b3801762123797490e3a2d45220 (diff) | |
download | nspr-hg-de7201513f7e04719584eef7136880bb1524e7ad.tar.gz |
Bug 432430: Checked in the straightforward porting changes for Symbian OS.
The patch is contributed by Harry Li <harry.li@pagefreedom.org>. r=wtc.
Modified files: prmapopt.c prosdep.c uxrng.c prsystem.c prtime.c ptsynch.c
-rw-r--r-- | pr/src/io/prmapopt.c | 3 | ||||
-rw-r--r-- | pr/src/md/prosdep.c | 2 | ||||
-rw-r--r-- | pr/src/md/unix/uxrng.c | 3 | ||||
-rw-r--r-- | pr/src/misc/prsystem.c | 2 | ||||
-rw-r--r-- | pr/src/misc/prtime.c | 2 | ||||
-rw-r--r-- | pr/src/pthreads/ptsynch.c | 3 |
6 files changed, 9 insertions, 6 deletions
diff --git a/pr/src/io/prmapopt.c b/pr/src/io/prmapopt.c index e4811e57..72dd42a5 100644 --- a/pr/src/io/prmapopt.c +++ b/pr/src/io/prmapopt.c @@ -70,7 +70,8 @@ #include <netinet/in_systm.h> /* n_short, n_long, n_time */ #endif -#if defined(XP_UNIX) || defined(OS2) || (defined(XP_BEOS) && defined(BONE_VERSION)) +#if (defined(XP_UNIX) && !defined(SYMBIAN)) \ + || defined(OS2) || (defined(XP_BEOS) && defined(BONE_VERSION)) #include <netinet/tcp.h> /* TCP_NODELAY, TCP_MAXSEG */ #endif diff --git a/pr/src/md/prosdep.c b/pr/src/md/prosdep.c index 0f01b84c..9130c239 100644 --- a/pr/src/md/prosdep.c +++ b/pr/src/md/prosdep.c @@ -66,7 +66,7 @@ static void GetPageSize(void) #if defined SUNOS4 || defined BSDI || defined AIX \ || defined LINUX || defined __GNU__ || defined __GLIBC__ \ || defined FREEBSD || defined NETBSD || defined OPENBSD \ - || defined DARWIN || defined NEXTSTEP + || defined DARWIN || defined NEXTSTEP || defined SYMBIAN _pr_pageSize = getpagesize(); #elif defined(HPUX) /* I have no idea. Don't get me started. --Rob */ diff --git a/pr/src/md/unix/uxrng.c b/pr/src/md/unix/uxrng.c index 50b18826..739f0819 100644 --- a/pr/src/md/unix/uxrng.c +++ b/pr/src/md/unix/uxrng.c @@ -139,7 +139,8 @@ GetHighResClock(void *buf, size_t maxbytes) } #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \ - || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD)) + || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD)) \ + || defined(SYMBIAN) #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/pr/src/misc/prsystem.c b/pr/src/misc/prsystem.c index 1c6c2825..8ccdff84 100644 --- a/pr/src/misc/prsystem.c +++ b/pr/src/misc/prsystem.c @@ -259,7 +259,7 @@ PR_IMPLEMENT(PRInt32) PR_GetNumberOfProcessors( void ) } #elif defined(IRIX) numCpus = sysconf( _SC_NPROC_ONLN ); -#elif defined(RISCOS) +#elif defined(RISCOS) || defined(SYMBIAN) numCpus = 1; #elif defined(XP_UNIX) numCpus = sysconf( _SC_NPROCESSORS_ONLN ); diff --git a/pr/src/misc/prtime.c b/pr/src/misc/prtime.c index 9c8b379e..3ac27afa 100644 --- a/pr/src/misc/prtime.c +++ b/pr/src/misc/prtime.c @@ -1714,7 +1714,7 @@ PR_FormatTime(char *buf, int buflen, const char *fmt, const PRExplodedTime *tm) #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \ || defined(NETBSD) || defined(OPENBSD) || defined(FREEBSD) \ - || defined(DARWIN) + || defined(DARWIN) || defined(SYMBIAN) a.tm_zone = NULL; a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset; #endif diff --git a/pr/src/pthreads/ptsynch.c b/pr/src/pthreads/ptsynch.c index bd0688c2..93b54880 100644 --- a/pr/src/pthreads/ptsynch.c +++ b/pr/src/pthreads/ptsynch.c @@ -811,7 +811,8 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char *name) * From the semctl(2) man page in glibc 2.0 */ #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ - || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) + || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) \ + || defined(SYMBIAN) /* union semun is defined by including <sys/sem.h> */ #else /* according to X/OPEN we have to define it ourselves */ |