← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nspr/saucy-updates

« back to all changes in this revision

Viewing changes to mozilla/nsprpub/pr/src/io/prsocket.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-08-10 11:34:26 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090810113426-3uv4diflrkcbdimm
Tags: 4.8-0ubuntu1
https://launchpad.net/bugs/387812
* New upstream release: 4.8 (LP: #387812)
* adjust patches to changed upstreanm codebase
  - update debian/patches/99_configure.patch
* update shlibs symbols to include new API elements
  - update debian/libnspr4-0d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/nsprpub/pr/src/io/prsocket.c
355
355
    }
356
356
    return PR_SUCCESS;
357
357
 
358
 
#elif defined(XP_MAC)
359
 
 
360
 
    err = _MD_mac_get_nonblocking_connect_error(fd);
361
 
    if (err == -1)
362
 
        return PR_FAILURE;
363
 
        else     
364
 
                return PR_SUCCESS;
365
 
 
366
358
#elif defined(XP_BEOS)
367
359
 
368
360
#ifdef BONE_VERSION  /* bug 122364 */
459
451
         * of the listening socket.  As an optimization, these
460
452
         * platforms can skip the following _PR_MD_MAKE_NONBLOCK
461
453
         * call.
462
 
         * 
463
 
         * On Mac, we MUST make this call, because _PR_MD_MAKE_NONBLOCK
464
 
         * (which maps to _MD_makenonblock, see macsockotpt.c)
465
 
         * installs the async notifier routine needed to make blocking
466
 
         * I/O work properly.
467
454
         */
468
455
#if !defined(SOLARIS) && !defined(IRIX) && !defined(WINNT)
469
456
        _PR_MD_MAKE_NONBLOCK(fd2);
770
757
 
771
758
static PRStatus PR_CALLBACK SocketSync(PRFileDesc *fd)
772
759
{
773
 
#if defined(XP_MAC)
774
 
#pragma unused (fd)
775
 
#endif
776
 
 
777
760
        return PR_SUCCESS;
778
761
}
779
762
 
1122
1105
static PRInt16 PR_CALLBACK SocketPoll(
1123
1106
    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags)
1124
1107
{
1125
 
#ifdef XP_MAC
1126
 
#pragma unused( fd, in_flags )
1127
 
#endif
1128
1108
    *out_flags = 0;
1129
1109
    return in_flags;
1130
1110
}  /* SocketPoll */
1689
1669
 
1690
1670
 
1691
1671
#if !defined(NEED_SELECT)
1692
 
#if !defined(XP_MAC)
1693
1672
#include "obsolete/probslet.h"
1694
 
#else
1695
 
#include "probslet.h"
1696
 
#endif
1697
1673
 
1698
1674
#define PD_INCR 20
1699
1675