17093 - Make plevent.c independent of NSPR internal headers

Status: RESOLVED FIXED

(NSPR :: NSPR, defect, P3)

Description

[Wan-Teh Chang]

Right now plevent.c includes the NSPR internal header
primpl.h.  This is an obstacle to moving PLEvents out
of NSPR.

The main reason that plevent.c needs to include
primpl.h is to access the 'entryCount' field of the
opaque structure PRMonitor.  This can be avoided by
calling the PR_GetMonitorEntryCount() function.
The current code reads 'entryCount' only if
PR_GetMonitorEntryCount() is nonzero. If
PR_GetMonitorEntryCount() returns a nonzero
value, that value is the 'entryCount' field of the
PRMonitor.  So the read of the 'entryCount' field
is not necessary.

Since primpl.h pulls in a lot of system header files,
plevent.c may indirectly depend on them.  For example,
on WIN32 plevent.c gets <windows.h> through primpl.h.
If we remove the inclusion of primpl.h, we will need
to include <windows.h>.

Comment 1

[Wan-Teh Chang]

Attachment: A patch that's been tested on Linux and Win32

Comment 2

[Wan-Teh Chang]

Attachment: Patched mozilla/nsprpub/lib/ds/plevent.c, revision 3.28, for Mac testing

Comment 3

[Wan-Teh Chang]

Steve, could you test the patched plevent.c
(second attachment, id=2373) on the Mac? Thanks.

Comment 4

[Steve Dagley]

Verified on Mac - no problems compiling.

Comment 5

[Wan-Teh Chang]

Thanks, Steve.

Now I need a code reviewer. :-)

Comment 6

[srinivas]

The modifications look good.

Comment 7

[Wan-Teh Chang]

Thanks for the code review, Srinivas.

I just checked in the fix.
/cvsroot/mozilla/nsprpub/lib/ds/Makefile, revision 3.16
/cvsroot/mozilla/nsprpub/lib/ds/Makefile.in, revision 1.7
/cvsroot/mozilla/nsprpub/lib/ds/plevent.c, revision 3.29