Bug 476996: deleted code that references old XP_MAC files that have been
authorwtc%google.com
Fri, 06 Feb 2009 00:15:41 +0000
changeset 4038 47994da012de5066c1947f8e94ec55cd67ae208e
parent 4037 8a5e8073c45c7a6ada1601061d232a4059ace38d
child 4039 8289c462d6c8186658d373711289435b738fc9b7
push idunknown
push userunknown
push dateunknown
bugs476996
Bug 476996: deleted code that references old XP_MAC files that have been cvs-removed. r=julien.pierre. Modified Files: prinet.h prosdep.h prpolevt.c prsocket.c
pr/include/md/prosdep.h
pr/include/prinet.h
pr/src/io/prpolevt.c
pr/src/io/prsocket.c
--- a/pr/include/md/prosdep.h
+++ b/pr/include/md/prosdep.h
@@ -58,20 +58,16 @@ PR_BEGIN_EXTERN_C
 #include "md/_win16.h"
 #elif defined(OS2)
 #include "md/_os2.h"
 #include "md/_os2_errors.h"
 #else
 #error unknown Windows platform
 #endif
 
-#elif defined XP_MAC
-
-#include "_macos.h"
-
 #elif defined(XP_UNIX)
 
 #if defined(AIX)
 #include "md/_aix.h"
 
 #elif defined(FREEBSD)
 #include "md/_freebsd.h"
 
--- a/pr/include/prinet.h
+++ b/pr/include/prinet.h
@@ -117,19 +117,15 @@ struct sockaddr_dl;
  * the <windows.h> inclusion at customer's request, which created
  * an unfortunate inconsistency with other platforms.
  */
 
 #elif defined(WIN16)
 
 #include <winsock.h>
 
-#elif defined(XP_MAC)
-
-#include "macsocket.h"
-
 #else
 
 #error Unknown platform
 
 #endif
 
 #endif /* prinet_h__ */
--- a/pr/src/io/prpolevt.c
+++ b/pr/src/io/prpolevt.c
@@ -130,203 +130,16 @@ PR_IMPLEMENT(PRStatus) PR_WaitForPollabl
     status = sys$clref(-PR_FileDesc2NativeHandle(event));
     if (!$VMS_STATUS_SUCCESS(status)) {
         PR_SetError(PR_INVALID_ARGUMENT_ERROR, status);
         return PR_FAILURE;
     }
     return PR_SUCCESS;
 }
 
-#elif defined (XP_MAC)
-
-#include "primpl.h"
-
-/*
- * On Mac, local sockets cannot be used, because the networking stack
- * closes them when the machine goes to sleep. Instead, we'll use a simple
- * flag.
- */
-
-
-/*
- * PRFilePrivate structure for the NSPR pollable events layer
- */
-typedef struct PRPollableDesc {
-    PRBool      gotEvent;
-    PRThread    *pollingThread;
-} PRPollableDesc;
-
-static PRStatus PR_CALLBACK _pr_MacPolEvtClose(PRFileDesc *fd);
-
-static PRInt16 PR_CALLBACK _pr_MacPolEvtPoll(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags);
-
-static PRIOMethods _pr_mac_polevt_methods = {
-    PR_DESC_LAYERED,
-    _pr_MacPolEvtClose,
-    (PRReadFN)_PR_InvalidInt,
-    (PRWriteFN)_PR_InvalidInt,
-    (PRAvailableFN)_PR_InvalidInt,
-    (PRAvailable64FN)_PR_InvalidInt64,
-    (PRFsyncFN)_PR_InvalidStatus,
-    (PRSeekFN)_PR_InvalidInt,
-    (PRSeek64FN)_PR_InvalidInt64,
-    (PRFileInfoFN)_PR_InvalidStatus,
-    (PRFileInfo64FN)_PR_InvalidStatus,
-    (PRWritevFN)_PR_InvalidInt,        
-    (PRConnectFN)_PR_InvalidStatus,        
-    (PRAcceptFN)_PR_InvalidDesc,        
-    (PRBindFN)_PR_InvalidStatus,        
-    (PRListenFN)_PR_InvalidStatus,        
-    (PRShutdownFN)_PR_InvalidStatus,    
-    (PRRecvFN)_PR_InvalidInt,        
-    (PRSendFN)_PR_InvalidInt,        
-    (PRRecvfromFN)_PR_InvalidInt,    
-    (PRSendtoFN)_PR_InvalidInt,        
-    _pr_MacPolEvtPoll,
-    (PRAcceptreadFN)_PR_InvalidInt,   
-    (PRTransmitfileFN)_PR_InvalidInt, 
-    (PRGetsocknameFN)_PR_InvalidStatus,    
-    (PRGetpeernameFN)_PR_InvalidStatus,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRReservedFN)_PR_InvalidInt,    
-    (PRGetsocketoptionFN)_PR_InvalidStatus,
-    (PRSetsocketoptionFN)_PR_InvalidStatus,
-    (PRSendfileFN)_PR_InvalidInt, 
-    (PRConnectcontinueFN)_PR_InvalidStatus, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt, 
-    (PRReservedFN)_PR_InvalidInt
-};
-
-static PRDescIdentity _pr_mac_polevt_id;
-static PRCallOnceType _pr_mac_polevt_once_control;
-static PRStatus PR_CALLBACK _pr_MacPolEvtInit(void);
-
-static PRInt16 PR_CALLBACK _pr_MacPolEvtPoll(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags)
-{
-    PRPollableDesc   *pollDesc = (PRPollableDesc *)fd->secret;
-    PR_ASSERT(pollDesc);
-
-    // set the current thread so that we can wake up the poll thread
-    pollDesc->pollingThread = PR_GetCurrentThread();
-
-    if ((in_flags & PR_POLL_READ) && pollDesc->gotEvent)
-        *out_flags = PR_POLL_READ;
-    else
-        *out_flags = 0;
-    return pollDesc->gotEvent ? 1 : 0;
-}
-
-static PRStatus PR_CALLBACK _pr_MacPolEvtInit(void)
-{
-    _pr_mac_polevt_id = PR_GetUniqueIdentity("NSPR pollable events");
-    if (PR_INVALID_IO_LAYER == _pr_mac_polevt_id) {
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-}
-
-static PRStatus PR_CALLBACK _pr_MacPolEvtClose(PRFileDesc *fd)
-{
-    PRPollableDesc   *pollDesc = (PRPollableDesc *)fd->secret;
-    PR_ASSERT(NULL == fd->higher && NULL == fd->lower);
-    PR_ASSERT(pollDesc);
-    PR_DELETE(pollDesc);
-    fd->dtor(fd);
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRFileDesc *) PR_NewPollableEvent(void)
-{
-    PRFileDesc      *event;
-    PRPollableDesc   *pollDesc;
-    
-    if (PR_CallOnce(&_pr_mac_polevt_once_control, _pr_MacPolEvtInit) == PR_FAILURE) {
-        return NULL;
-    }
-
-    event = PR_CreateIOLayerStub(_pr_mac_polevt_id, &_pr_mac_polevt_methods);
-    if (NULL == event) {
-        return NULL;
-    } 
-
-    /*
-    ** Allocate an event flag and clear it.
-    */
-    pollDesc = PR_NEW(PRPollableDesc);
-    if (!pollDesc) {
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
-        goto errorExit;
-    }
-
-    pollDesc->gotEvent = PR_FALSE;
-    pollDesc->pollingThread = NULL;
-    
-    event->secret = (PRFilePrivate*)pollDesc;
-    return event;
-
-errorExit:
-
-    if (event) {
-        PR_DELETE(event->secret);
-        event->dtor(event);
-    }
-    return NULL;
-}
-
-PR_IMPLEMENT(PRStatus) PR_DestroyPollableEvent(PRFileDesc *event)
-{
-    return PR_Close(event);
-}
-
-/* from macsockotpt.c. I wish there was a cleaner way */
-extern void WakeUpNotifiedThread(PRThread *thread, OTResult result);
-
-PR_IMPLEMENT(PRStatus) PR_SetPollableEvent(PRFileDesc *event)
-{
-    PRPollableDesc   *pollDesc = (PRPollableDesc *)event->secret;
-    PR_ASSERT(pollDesc);
-    PR_ASSERT(pollDesc->pollingThread->state != _PR_DEAD_STATE);
-    
-    if (pollDesc->pollingThread->state == _PR_DEAD_STATE)
-      return PR_FAILURE;
-
-    pollDesc->gotEvent = PR_TRUE;
-    
-    if (pollDesc->pollingThread)
-        WakeUpNotifiedThread(pollDesc->pollingThread, noErr);
-        
-    return PR_SUCCESS;
-}
-
-PR_IMPLEMENT(PRStatus) PR_WaitForPollableEvent(PRFileDesc *event)
-{
-    PRPollableDesc   *pollDesc = (PRPollableDesc *)event->secret;
-    PRStatus status;    
-    PR_ASSERT(pollDesc);
-    
-    /*
-      FIXME: Danger Will Robinson!
-      
-      The current implementation of PR_WaitForPollableEvent is somewhat
-      bogus; it makes the assumption that, in Mozilla, this will only
-      ever be called when PR_Poll has returned, telling us that an
-      event has been set.
-    */
-    
-    PR_ASSERT(pollDesc->gotEvent);
-    
-    status = (pollDesc->gotEvent) ? PR_SUCCESS : PR_FAILURE;
-    pollDesc->gotEvent = PR_FALSE;
-    return status;    
-}
-
 #else /* VMS */
 
 /*
  * These internal functions are declared in primpl.h,
  * but we can't include primpl.h because the definition
  * of struct PRFilePrivate in this file (for the pollable
  * event layer) will conflict with the definition of
  * struct PRFilePrivate in primpl.h (for the NSPR layer).
--- a/pr/src/io/prsocket.c
+++ b/pr/src/io/prsocket.c
@@ -454,21 +454,16 @@ PRIntervalTime timeout)
 #endif
 
 	/*
 	 * On some platforms, the new socket created by accept()
 	 * inherits the nonblocking (or overlapped io) attribute
 	 * of the listening socket.  As an optimization, these
 	 * platforms can skip the following _PR_MD_MAKE_NONBLOCK
 	 * call.
-	 * 
-	 * On Mac, we MUST make this call, because _PR_MD_MAKE_NONBLOCK
-	 * (which maps to _MD_makenonblock, see macsockotpt.c)
-	 * installs the async notifier routine needed to make blocking
-	 * I/O work properly.
 	 */
 #if !defined(SOLARIS) && !defined(IRIX) && !defined(WINNT)
 	_PR_MD_MAKE_NONBLOCK(fd2);
 #endif
 
 #ifdef _PR_INET6
 	if (addr && (AF_INET6 == addr->raw.family))
         addr->raw.family = PR_AF_INET6;