summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2006-02-07 19:22:05 +0000
committerwtchang%redhat.com <devnull@localhost>2006-02-07 19:22:05 +0000
commit6f176b9711efc07e4bdae01358a21770d231a7b5 (patch)
tree7b1d08dc346a1fd64437fe2e78423477c820c78f
parentf5aa36b48ca3de4236b4ed1608092c1beeaf3d23 (diff)
downloadnspr-hg-6f176b9711efc07e4bdae01358a21770d231a7b5.tar.gz
Bugzilla bug 326110: declare PR_SetSysfdTableSize and PR_GetSysfdTableMax
with NSPR_API and use PR_IMPLEMENT with their definitions so that they can be exported from the NSPR shared library/DLL. r=kengert,jpierre. Thanks to Noriko Hosoi <nhosoi@redhat.com> for the bug report. Modified Files: probslet.h prfile.c ptio.c Tag: MOZILLA_1_8_BRANCH
-rw-r--r--pr/include/obsolete/probslet.h9
-rw-r--r--pr/src/io/prfile.c4
-rw-r--r--pr/src/pthreads/ptio.c4
3 files changed, 13 insertions, 4 deletions
diff --git a/pr/include/obsolete/probslet.h b/pr/include/obsolete/probslet.h
index 374e696c..fffd1ed8 100644
--- a/pr/include/obsolete/probslet.h
+++ b/pr/include/obsolete/probslet.h
@@ -158,6 +158,15 @@ NSPR_API(void) PR_FD_NSET(PRInt32 osfd, PR_fd_set *set);
NSPR_API(void) PR_FD_NCLR(PRInt32 osfd, PR_fd_set *set);
NSPR_API(PRInt32) PR_FD_NISSET(PRInt32 osfd, PR_fd_set *set);
+/*
+** The next two entry points should not be in the API, but they are
+** declared here for historical reasons.
+*/
+
+NSPR_API(PRInt32) PR_GetSysfdTableMax(void);
+
+NSPR_API(PRInt32) PR_SetSysfdTableSize(PRIntn table_size);
+
#ifndef NO_NSPR_10_SUPPORT
#ifdef XP_MAC
#include <stat.h>
diff --git a/pr/src/io/prfile.c b/pr/src/io/prfile.c
index d91bffa2..cdde160b 100644
--- a/pr/src/io/prfile.c
+++ b/pr/src/io/prfile.c
@@ -412,7 +412,7 @@ PR_IMPLEMENT(PRFileDesc*) PR_OpenFile(
return fd;
}
-PRInt32 PR_GetSysfdTableMax(void)
+PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void)
{
#if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX)
struct rlimit rlim;
@@ -445,7 +445,7 @@ PRInt32 PR_GetSysfdTableMax(void)
#endif
}
-PRInt32 PR_SetSysfdTableSize(int table_size)
+PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(int table_size)
{
#if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX)
struct rlimit rlim;
diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c
index 7a4ce96f..1c2974aa 100644
--- a/pr/src/pthreads/ptio.c
+++ b/pr/src/pthreads/ptio.c
@@ -4583,7 +4583,7 @@ PR_IMPLEMENT(PRStatus) PR_UnlockFile(PRFileDesc *fd)
* defined here for historical (or hysterical) reasons.
*/
-PRInt32 PR_GetSysfdTableMax(void)
+PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void)
{
#if defined(XP_UNIX) && !defined(AIX) && !defined(VMS)
struct rlimit rlim;
@@ -4597,7 +4597,7 @@ PRInt32 PR_GetSysfdTableMax(void)
#endif
}
-PRInt32 PR_SetSysfdTableSize(PRIntn table_size)
+PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(PRIntn table_size)
{
#if defined(XP_UNIX) && !defined(AIX) && !defined(VMS)
struct rlimit rlim;