This is a good idea. We can start by removing all the files in mozilla/nsprpub/pr/src/md/mac from CVS.

I removed pr/include/md/_macos.h and all the files in pr/src/md/mac/ from CVS. Removing pr/include/md/_macos.h; /cvsroot/mozilla/nsprpub/pr/include/md/_macos.h,v <-- _macos.h new revision: delete; previous revision: 3.41 done Removing pr/src/md/mac/MANIFEST; /cvsroot/mozilla/nsprpub/pr/src/md/mac/MANIFEST,v <-- MANIFEST new revision: delete; previous revision: 1.1 done Removing pr/src/md/mac/MacErrorHandling.h; /cvsroot/mozilla/nsprpub/pr/src/md/mac/MacErrorHandling.h,v <-- MacErrorHandli ng.h new revision: delete; previous revision: 3.4 done Removing pr/src/md/mac/macdll.c; /cvsroot/mozilla/nsprpub/pr/src/md/mac/macdll.c,v <-- macdll.c new revision: delete; previous revision: 3.12 done Removing pr/src/md/mac/macdll.h; /cvsroot/mozilla/nsprpub/pr/src/md/mac/macdll.h,v <-- macdll.h new revision: delete; previous revision: 1.5 done Removing pr/src/md/mac/macio.c; /cvsroot/mozilla/nsprpub/pr/src/md/mac/macio.c,v <-- macio.c new revision: delete; previous revision: 3.37 done Removing pr/src/md/mac/macio.h; /cvsroot/mozilla/nsprpub/pr/src/md/mac/macio.h,v <-- macio.h new revision: delete; previous revision: 1.4 done Removing pr/src/md/mac/macrng.c; /cvsroot/mozilla/nsprpub/pr/src/md/mac/macrng.c,v <-- macrng.c new revision: delete; previous revision: 1.7 done Removing pr/src/md/mac/macsocket.h; /cvsroot/mozilla/nsprpub/pr/src/md/mac/macsocket.h,v <-- macsocket.h new revision: delete; previous revision: 3.8 done Removing pr/src/md/mac/macsockotpt.c; /cvsroot/mozilla/nsprpub/pr/src/md/mac/macsockotpt.c,v <-- macsockotpt.c new revision: delete; previous revision: 3.42 done Removing pr/src/md/mac/macthr.c; /cvsroot/mozilla/nsprpub/pr/src/md/mac/macthr.c,v <-- macthr.c new revision: delete; previous revision: 3.22 done Removing pr/src/md/mac/mactime.c; /cvsroot/mozilla/nsprpub/pr/src/md/mac/mactime.c,v <-- mactime.c new revision: delete; previous revision: 3.8 done Removing pr/src/md/mac/mactime.h; /cvsroot/mozilla/nsprpub/pr/src/md/mac/mactime.h,v <-- mactime.h new revision: delete; previous revision: 1.4 done Removing pr/src/md/mac/mdcriticalregion.c; /cvsroot/mozilla/nsprpub/pr/src/md/mac/mdcriticalregion.c,v <-- mdcriticalregi on.c new revision: delete; previous revision: 1.4 done Removing pr/src/md/mac/mdcriticalregion.h; /cvsroot/mozilla/nsprpub/pr/src/md/mac/mdcriticalregion.h,v <-- mdcriticalregi on.h new revision: delete; previous revision: 1.3 done Removing pr/src/md/mac/mdmac.c; /cvsroot/mozilla/nsprpub/pr/src/md/mac/mdmac.c,v <-- mdmac.c new revision: delete; previous revision: 3.20 done Removing pr/src/md/mac/mdmac.h; /cvsroot/mozilla/nsprpub/pr/src/md/mac/mdmac.h,v <-- mdmac.h new revision: delete; previous revision: 1.4 done Removing pr/src/md/mac/prcpucfg.h; /cvsroot/mozilla/nsprpub/pr/src/md/mac/prcpucfg.h,v <-- prcpucfg.h new revision: delete; previous revision: 3.11 done

Comment on attachment 360813 [details] [diff] [review] Delete code that references old XP_MAC files that have been cvs-removed (checked in) Wan-Teh. This looks fine. Could you please review the similar patch for WIN16 in bug 433791 ?

Comment on attachment 360813 [details] [diff] [review] Delete code that references old XP_MAC files that have been cvs-removed (checked in) I checked in this patch on the NSPR trunk (NSPR 4.8). Checking in pr/include/prinet.h; /cvsroot/mozilla/nsprpub/pr/include/prinet.h,v <-- prinet.h new revision: 3.15; previous revision: 3.14 done Checking in pr/include/md/prosdep.h; /cvsroot/mozilla/nsprpub/pr/include/md/prosdep.h,v <-- prosdep.h new revision: 3.20; previous revision: 3.19 done Checking in pr/src/io/prpolevt.c; /cvsroot/mozilla/nsprpub/pr/src/io/prpolevt.c,v <-- prpolevt.c new revision: 3.16; previous revision: 3.15 done Checking in pr/src/io/prsocket.c; /cvsroot/mozilla/nsprpub/pr/src/io/prsocket.c,v <-- prsocket.c new revision: 3.63; previous revision: 3.62 done

The remaining occurrences of XP_MAC in nsprpub are shown at > http://mxr.mozilla.org/security/search?string=XP_MAC&case=on&find=nsprpub&findi=&filter=XP_MAC%5Cb&hitlimit=&tree=security

This patch strips out all the remaining #ifdef XP_MAC code. It was almost entirely machine-generated with 'unifdef'; I read over the entire thing to make sure it wasn't doing anything stupid, manually removed two comments that applied to code that was deleted, and cleaned up some occurrences of XP_MAC in complex conditionals that unifdef did not touch. I did *not* correct any of the myriad places where this left undesirable blank lines (e.g. immediately after the opening { of a function) -- it was just too tedious. I recommend going over the entire library with 'indent' if you actually care about this; there are plenty of places where the code is ill-formatted already, and a shocking amount of trailing whitespace (I have my editor set to highlight this). Tested on Linux (only) with a client.mk depend build in mozilla-central (which, as it happens, recompiles just about everything, since prtypes.h changed). I would have liked to run the nspr tests but their makefiles are broken. $ grep -rwlF XP_MAC nsprpub/ finds no further instances of the token.

Zack, thanks a lot for the patch. I removed the blank lines and made a few minor edits. I checked in the patch on the NSPR trunk (NSPR 4.8). Checking in lib/ds/plarena.c; /cvsroot/mozilla/nsprpub/lib/ds/plarena.c,v <-- plarena.c new revision: 3.16; previous revision: 3.15 done Checking in lib/ds/plhash.c; /cvsroot/mozilla/nsprpub/lib/ds/plhash.c,v <-- plhash.c new revision: 3.13; previous revision: 3.12 done Checking in lib/msgc/src/prgcapi.c; /cvsroot/mozilla/nsprpub/lib/msgc/src/prgcapi.c,v <-- prgcapi.c new revision: 3.8; previous revision: 3.7 done Checking in lib/msgc/src/prmsgc.c; /cvsroot/mozilla/nsprpub/lib/msgc/src/prmsgc.c,v <-- prmsgc.c new revision: 3.12; previous revision: 3.11 done Checking in lib/msgc/tests/gc1.c; /cvsroot/mozilla/nsprpub/lib/msgc/tests/gc1.c,v <-- gc1.c new revision: 3.7; previous revision: 3.6 done Checking in lib/msgc/tests/thrashgc.c; /cvsroot/mozilla/nsprpub/lib/msgc/tests/thrashgc.c,v <-- thrashgc.c new revision: 3.6; previous revision: 3.5 done Checking in pr/include/prenv.h; /cvsroot/mozilla/nsprpub/pr/include/prenv.h,v <-- prenv.h new revision: 3.12; previous revision: 3.11 done Checking in pr/include/prtypes.h; /cvsroot/mozilla/nsprpub/pr/include/prtypes.h,v <-- prtypes.h new revision: 3.41; previous revision: 3.40 done Checking in pr/include/obsolete/probslet.h; /cvsroot/mozilla/nsprpub/pr/include/obsolete/probslet.h,v <-- probslet.h new revision: 3.12; previous revision: 3.11 done Checking in pr/include/obsolete/protypes.h; /cvsroot/mozilla/nsprpub/pr/include/obsolete/protypes.h,v <-- protypes.h new revision: 3.21; previous revision: 3.20 done Checking in pr/include/private/pprio.h; /cvsroot/mozilla/nsprpub/pr/include/private/pprio.h,v <-- pprio.h new revision: 3.18; previous revision: 3.17 done Checking in pr/include/private/pprthred.h; /cvsroot/mozilla/nsprpub/pr/include/private/pprthred.h,v <-- pprthred.h new revision: 3.10; previous revision: 3.9 done Checking in pr/include/private/primpl.h; /cvsroot/mozilla/nsprpub/pr/include/private/primpl.h,v <-- primpl.h new revision: 3.91; previous revision: 3.90 done Checking in pr/include/private/prpriv.h; /cvsroot/mozilla/nsprpub/pr/include/private/prpriv.h,v <-- prpriv.h new revision: 3.6; previous revision: 3.5 done Checking in pr/src/prvrsion.c; /cvsroot/mozilla/nsprpub/pr/src/prvrsion.c,v <-- prvrsion.c new revision: 3.16; previous revision: 3.15 done Checking in pr/src/io/prfile.c; /cvsroot/mozilla/nsprpub/pr/src/io/prfile.c,v <-- prfile.c new revision: 3.47; previous revision: 3.46 done Checking in pr/src/io/prio.c; /cvsroot/mozilla/nsprpub/pr/src/io/prio.c,v <-- prio.c new revision: 3.23; previous revision: 3.22 done Checking in pr/src/io/prlog.c; /cvsroot/mozilla/nsprpub/pr/src/io/prlog.c,v <-- prlog.c new revision: 3.46; previous revision: 3.45 done Checking in pr/src/io/prmwait.c; /cvsroot/mozilla/nsprpub/pr/src/io/prmwait.c,v <-- prmwait.c new revision: 3.20; previous revision: 3.19 done Checking in pr/src/io/prsocket.c; /cvsroot/mozilla/nsprpub/pr/src/io/prsocket.c,v <-- prsocket.c new revision: 3.64; previous revision: 3.63 done Checking in pr/src/md/prosdep.c; /cvsroot/mozilla/nsprpub/pr/src/md/prosdep.c,v <-- prosdep.c new revision: 3.14; previous revision: 3.13 done Checking in pr/src/misc/pralarm.c; /cvsroot/mozilla/nsprpub/pr/src/misc/pralarm.c,v <-- pralarm.c new revision: 3.9; previous revision: 3.8 done Checking in pr/src/misc/prenv.c; /cvsroot/mozilla/nsprpub/pr/src/misc/prenv.c,v <-- prenv.c new revision: 3.12; previous revision: 3.11 done Checking in pr/src/misc/prinit.c; /cvsroot/mozilla/nsprpub/pr/src/misc/prinit.c,v <-- prinit.c new revision: 3.50; previous revision: 3.49 done Checking in pr/src/misc/prolock.c; /cvsroot/mozilla/nsprpub/pr/src/misc/prolock.c,v <-- prolock.c new revision: 3.9; previous revision: 3.8 done Checking in pr/src/misc/prsystem.c; /cvsroot/mozilla/nsprpub/pr/src/misc/prsystem.c,v <-- prsystem.c new revision: 3.33; previous revision: 3.32 done Checking in pr/src/misc/prthinfo.c; /cvsroot/mozilla/nsprpub/pr/src/misc/prthinfo.c,v <-- prthinfo.c new revision: 3.11; previous revision: 3.10 done Checking in pr/src/misc/prtime.c; /cvsroot/mozilla/nsprpub/pr/src/misc/prtime.c,v <-- prtime.c new revision: 3.41; previous revision: 3.40 done Checking in pr/src/threads/prcthr.c; /cvsroot/mozilla/nsprpub/pr/src/threads/prcthr.c,v <-- prcthr.c new revision: 3.20; previous revision: 3.19 done Checking in pr/src/threads/prsem.c; /cvsroot/mozilla/nsprpub/pr/src/threads/prsem.c,v <-- prsem.c new revision: 3.6; previous revision: 3.5 done Checking in pr/src/threads/combined/prucpu.c; /cvsroot/mozilla/nsprpub/pr/src/threads/combined/prucpu.c,v <-- prucpu.c new revision: 3.15; previous revision: 3.14 done Checking in pr/src/threads/combined/prucv.c; /cvsroot/mozilla/nsprpub/pr/src/threads/combined/prucv.c,v <-- prucv.c new revision: 3.9; previous revision: 3.8 done Checking in pr/src/threads/combined/prulock.c; /cvsroot/mozilla/nsprpub/pr/src/threads/combined/prulock.c,v <-- prulock.c new revision: 3.14; previous revision: 3.13 done Checking in pr/src/threads/combined/pruthr.c; /cvsroot/mozilla/nsprpub/pr/src/threads/combined/pruthr.c,v <-- pruthr.c new revision: 3.37; previous revision: 3.36 done Checking in pr/tests/accept.c; /cvsroot/mozilla/nsprpub/pr/tests/accept.c,v <-- accept.c new revision: 3.15; previous revision: 3.14 done Checking in pr/tests/alarm.c; /cvsroot/mozilla/nsprpub/pr/tests/alarm.c,v <-- alarm.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/cltsrv.c; /cvsroot/mozilla/nsprpub/pr/tests/cltsrv.c,v <-- cltsrv.c new revision: 3.18; previous revision: 3.17 done Checking in pr/tests/concur.c; /cvsroot/mozilla/nsprpub/pr/tests/concur.c,v <-- concur.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/cvar.c; /cvsroot/mozilla/nsprpub/pr/tests/cvar.c,v <-- cvar.c new revision: 3.8; previous revision: 3.7 done Checking in pr/tests/cvar2.c; /cvsroot/mozilla/nsprpub/pr/tests/cvar2.c,v <-- cvar2.c new revision: 3.11; previous revision: 3.10 done Checking in pr/tests/fileio.c; /cvsroot/mozilla/nsprpub/pr/tests/fileio.c,v <-- fileio.c new revision: 3.8; previous revision: 3.7 done Checking in pr/tests/inrval.c; /cvsroot/mozilla/nsprpub/pr/tests/inrval.c,v <-- inrval.c new revision: 3.9; previous revision: 3.8 done Checking in pr/tests/intrio.c; /cvsroot/mozilla/nsprpub/pr/tests/intrio.c,v <-- intrio.c new revision: 3.8; previous revision: 3.7 done Checking in pr/tests/intrupt.c; /cvsroot/mozilla/nsprpub/pr/tests/intrupt.c,v <-- intrupt.c new revision: 3.11; previous revision: 3.10 done Checking in pr/tests/io_timeout.c; /cvsroot/mozilla/nsprpub/pr/tests/io_timeout.c,v <-- io_timeout.c new revision: 3.12; previous revision: 3.11 done Checking in pr/tests/join.c; /cvsroot/mozilla/nsprpub/pr/tests/join.c,v <-- join.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/joinkk.c; /cvsroot/mozilla/nsprpub/pr/tests/joinkk.c,v <-- joinkk.c new revision: 3.9; previous revision: 3.8 done Checking in pr/tests/joinku.c; /cvsroot/mozilla/nsprpub/pr/tests/joinku.c,v <-- joinku.c new revision: 3.8; previous revision: 3.7 done Checking in pr/tests/joinuk.c; /cvsroot/mozilla/nsprpub/pr/tests/joinuk.c,v <-- joinuk.c new revision: 3.8; previous revision: 3.7 done Checking in pr/tests/joinuu.c; /cvsroot/mozilla/nsprpub/pr/tests/joinuu.c,v <-- joinuu.c new revision: 3.8; previous revision: 3.7 done Checking in pr/tests/lock.c; /cvsroot/mozilla/nsprpub/pr/tests/lock.c,v <-- lock.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/lockfile.c; /cvsroot/mozilla/nsprpub/pr/tests/lockfile.c,v <-- lockfile.c new revision: 3.9; previous revision: 3.8 done Checking in pr/tests/logger.c; /cvsroot/mozilla/nsprpub/pr/tests/logger.c,v <-- logger.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/nbconn.c; /cvsroot/mozilla/nsprpub/pr/tests/nbconn.c,v <-- nbconn.c new revision: 3.11; previous revision: 3.10 done Checking in pr/tests/nonblock.c; /cvsroot/mozilla/nsprpub/pr/tests/nonblock.c,v <-- nonblock.c new revision: 3.12; previous revision: 3.11 done Checking in pr/tests/op_2long.c; /cvsroot/mozilla/nsprpub/pr/tests/op_2long.c,v <-- op_2long.c new revision: 3.11; previous revision: 3.10 done Checking in pr/tests/op_filnf.c; /cvsroot/mozilla/nsprpub/pr/tests/op_filnf.c,v <-- op_filnf.c new revision: 3.9; previous revision: 3.8 done Checking in pr/tests/op_filok.c; /cvsroot/mozilla/nsprpub/pr/tests/op_filok.c,v <-- op_filok.c new revision: 3.15; previous revision: 3.14 done Checking in pr/tests/op_noacc.c; /cvsroot/mozilla/nsprpub/pr/tests/op_noacc.c,v <-- op_noacc.c new revision: 3.9; previous revision: 3.8 done Checking in pr/tests/op_nofil.c; /cvsroot/mozilla/nsprpub/pr/tests/op_nofil.c,v <-- op_nofil.c new revision: 3.9; previous revision: 3.8 done Checking in pr/tests/perf.c; /cvsroot/mozilla/nsprpub/pr/tests/perf.c,v <-- perf.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/poll_er.c; /cvsroot/mozilla/nsprpub/pr/tests/poll_er.c,v <-- poll_er.c new revision: 3.9; previous revision: 3.8 done Checking in pr/tests/poll_nm.c; /cvsroot/mozilla/nsprpub/pr/tests/poll_nm.c,v <-- poll_nm.c new revision: 3.12; previous revision: 3.11 done Checking in pr/tests/poll_to.c; /cvsroot/mozilla/nsprpub/pr/tests/poll_to.c,v <-- poll_to.c new revision: 3.11; previous revision: 3.10 done Checking in pr/tests/priotest.c; /cvsroot/mozilla/nsprpub/pr/tests/priotest.c,v <-- priotest.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/provider.c; /cvsroot/mozilla/nsprpub/pr/tests/provider.c,v <-- provider.c new revision: 3.19; previous revision: 3.18 done Checking in pr/tests/prpoll.c; /cvsroot/mozilla/nsprpub/pr/tests/prpoll.c,v <-- prpoll.c new revision: 3.15; previous revision: 3.14 done Checking in pr/tests/ranfile.c; /cvsroot/mozilla/nsprpub/pr/tests/ranfile.c,v <-- ranfile.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/sel_spd.c; /cvsroot/mozilla/nsprpub/pr/tests/sel_spd.c,v <-- sel_spd.c new revision: 3.18; previous revision: 3.17 done Checking in pr/tests/selct_er.c; /cvsroot/mozilla/nsprpub/pr/tests/selct_er.c,v <-- selct_er.c new revision: 3.9; previous revision: 3.8 done Checking in pr/tests/selct_nm.c; /cvsroot/mozilla/nsprpub/pr/tests/selct_nm.c,v <-- selct_nm.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/selct_to.c; /cvsroot/mozilla/nsprpub/pr/tests/selct_to.c,v <-- selct_to.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/sem.c; /cvsroot/mozilla/nsprpub/pr/tests/sem.c,v <-- sem.c new revision: 3.8; previous revision: 3.7 done Checking in pr/tests/socket.c; /cvsroot/mozilla/nsprpub/pr/tests/socket.c,v <-- socket.c new revision: 3.22; previous revision: 3.21 done Checking in pr/tests/sockopt.c; /cvsroot/mozilla/nsprpub/pr/tests/sockopt.c,v <-- sockopt.c new revision: 3.16; previous revision: 3.15 done Checking in pr/tests/suspend.c; /cvsroot/mozilla/nsprpub/pr/tests/suspend.c,v <-- suspend.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/switch.c; /cvsroot/mozilla/nsprpub/pr/tests/switch.c,v <-- switch.c new revision: 3.9; previous revision: 3.8 done Checking in pr/tests/testfile.c; /cvsroot/mozilla/nsprpub/pr/tests/testfile.c,v <-- testfile.c new revision: 3.21; previous revision: 3.20 done Checking in pr/tests/threads.c; /cvsroot/mozilla/nsprpub/pr/tests/threads.c,v <-- threads.c new revision: 3.8; previous revision: 3.7 done Checking in pr/tests/thrpool_client.c; /cvsroot/mozilla/nsprpub/pr/tests/thrpool_client.c,v <-- thrpool_client.c new revision: 3.9; previous revision: 3.8 done Checking in pr/tests/thrpool_server.c; /cvsroot/mozilla/nsprpub/pr/tests/thrpool_server.c,v <-- thrpool_server.c new revision: 3.11; previous revision: 3.10 done Checking in pr/tests/timemac.c; /cvsroot/mozilla/nsprpub/pr/tests/timemac.c,v <-- timemac.c new revision: 3.8; previous revision: 3.7 done Checking in pr/tests/timetest.c; /cvsroot/mozilla/nsprpub/pr/tests/timetest.c,v <-- timetest.c new revision: 3.12; previous revision: 3.11 done Checking in pr/tests/tmoacc.c; /cvsroot/mozilla/nsprpub/pr/tests/tmoacc.c,v <-- tmoacc.c new revision: 3.11; previous revision: 3.10 done Checking in pr/tests/tmocon.c; /cvsroot/mozilla/nsprpub/pr/tests/tmocon.c,v <-- tmocon.c new revision: 3.15; previous revision: 3.14 done Checking in pr/tests/tpd.c; /cvsroot/mozilla/nsprpub/pr/tests/tpd.c,v <-- tpd.c new revision: 3.11; previous revision: 3.10 done Checking in pr/tests/udpsrv.c; /cvsroot/mozilla/nsprpub/pr/tests/udpsrv.c,v <-- udpsrv.c new revision: 3.10; previous revision: 3.9 done Checking in pr/tests/writev.c; /cvsroot/mozilla/nsprpub/pr/tests/writev.c,v <-- writev.c new revision: 3.8; previous revision: 3.7 done Checking in pr/tests/y2k.c; /cvsroot/mozilla/nsprpub/pr/tests/y2k.c,v <-- y2k.c new revision: 3.10; previous revision: 3.9 done

This file is only used for Mac OS Classic. I removed it from CVS on the NSPR trunk (NSPR 4.8). Removing macgc.c; /cvsroot/mozilla/nsprpub/lib/msgc/src/macgc.c,v <-- macgc.c new revision: delete; previous revision: 3.5 done

Update comments so that either they don't mention "Mac" (which meant Mac OS Classic) or they say "Mac OS Classic".

I was not expecting such a quick resolution. Thanks, Wan-Teh!

Comment on attachment 375994 [details] [diff] [review] Update comments (checked in) I checked in this patch on the NSPR trunk (NSPR 4.8). Checking in include/prinet.h; /cvsroot/mozilla/nsprpub/pr/include/prinet.h,v <-- prinet.h new revision: 3.17; previous revision: 3.16 done Checking in include/prlink.h; /cvsroot/mozilla/nsprpub/pr/include/prlink.h,v <-- prlink.h new revision: 3.15; previous revision: 3.14 done Checking in src/misc/prtime.c; /cvsroot/mozilla/nsprpub/pr/src/misc/prtime.c,v <-- prtime.c new revision: 3.42; previous revision: 3.41 done