Changeset 102217 in vbox for trunk/src/libs/xpcom18a4/nsprpub

Timestamp:

Nov 21, 2023 3:14:20 PM (14 months ago)

Author:

vboxsync

Message:

libs/xpcom: Clear out more unused stuff to fix the build, bugref:10545

File:

• trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_unixos.h (modified) (5 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_unixos.h

@@ -75 +75 @@
 #include <sys/time.h>
 #include <sys/types.h>
-#if defined(AIX)  /* Only pre-4.2 AIX needs it, but for simplicity... */
-#include <sys/select.h>
-#endif
 
 #define PR_DIRECTORY_SEPARATOR          '/'
@@ -91 +88 @@
 #define _PR_INTERRUPT_CHECK_INTERVAL_SECS 5
 extern PRIntervalTime intr_timeout_ticks;
-
-/*
- * The bit flags for the in_flags and out_flags fields
- * of _PR_UnixPollDesc
- */
-#ifdef _PR_USE_POLL
-#define _PR_UNIX_POLL_READ    POLLIN
-#define _PR_UNIX_POLL_WRITE   POLLOUT
-#define _PR_UNIX_POLL_EXCEPT  POLLPRI
-#define _PR_UNIX_POLL_ERR     POLLERR
-#define _PR_UNIX_POLL_NVAL    POLLNVAL
-#define _PR_UNIX_POLL_HUP     POLLHUP
-#else /* _PR_USE_POLL */
-#define _PR_UNIX_POLL_READ    0x1
-#define _PR_UNIX_POLL_WRITE   0x2
-#define _PR_UNIX_POLL_EXCEPT  0x4
-#define _PR_UNIX_POLL_ERR     0x8
-#define _PR_UNIX_POLL_NVAL    0x10
-#define _PR_UNIX_POLL_HUP     0x20
-#endif /* _PR_USE_POLL */
-
-typedef struct _PRUnixPollDesc {
-        PRInt32 osfd;
-        PRInt16 in_flags;
-        PRInt16 out_flags;
-} _PRUnixPollDesc;
-
-typedef struct PRPollQueue {
-    PRCList links;        /* for linking PRPollQueue's together */
-    _PRUnixPollDesc *pds;        /* array of poll descriptors */
-    PRUintn npds;            /* length of the array */
-    PRPackedBool on_ioq;    /* is this on the async i/o work q? */
-    PRIntervalTime timeout;        /* timeout, in ticks */
-    struct PRThread *thr;
-} PRPollQueue;
-
-#define _PR_POLLQUEUE_PTR(_qp) \
-    ((PRPollQueue*) ((char*) (_qp) - offsetof(PRPollQueue,links)))
-
-
-extern PRInt32 _PR_WaitForMultipleFDs(
-    _PRUnixPollDesc *unixpds,
-    PRInt32 pdcnt,
-    PRIntervalTime timeout);
-extern void _PR_Unblock_IO_Wait(struct PRThread *thr);
-
-extern fd_set _pr_md_read_set, _pr_md_write_set, _pr_md_exception_set;
-extern PRInt16 _pr_md_read_cnt[], _pr_md_write_cnt[], _pr_md_exception_cnt[];
-extern PRInt32 _pr_md_ioq_max_osfd;
-extern PRUint32 _pr_md_ioq_timeout;
-
-struct _MDFileDesc {
-    int osfd;
-#if defined(LINUX) && defined(_PR_PTHREADS)
-    int tcp_nodelay;  /* used by pt_LinuxSendFile */
-#endif
-};
-
-struct _MDDir {
-        DIR *d;
-};
-
-struct _PRCPU;
-extern void _MD_unix_init_running_cpu(struct _PRCPU *cpu);
 
 /*
@@ -225 +158 @@
 /************************************************************************/
 
-struct _MDProcess {
-    pid_t pid;
-};
-
-struct PRProcess;
-struct PRProcessAttr;
-
-/* Create a new process (fork() + exec()) */
-#define _MD_CREATE_PROCESS _MD_CreateUnixProcess
-extern struct PRProcess * _MD_CreateUnixProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const struct PRProcessAttr *attr
-);
-
-#ifdef VBOX
-/* Create a new detached process (fork() + exec()) */
-#define _MD_CREATE_PROCESS_DETACHED _MD_CreateUnixProcessDetached
-extern PRStatus _MD_CreateUnixProcessDetached(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const struct PRProcessAttr *attr
-);
-#endif /* VBOX */
-
-#define _MD_DETACH_PROCESS _MD_DetachUnixProcess
-extern PRStatus _MD_DetachUnixProcess(struct PRProcess *process);
-
-/* Wait for a child process to terminate */
-#define _MD_WAIT_PROCESS _MD_WaitUnixProcess
-extern PRStatus _MD_WaitUnixProcess(struct PRProcess *process,
-    PRInt32 *exitCode);
-
-#define _MD_KILL_PROCESS _MD_KillUnixProcess
-extern PRStatus _MD_KillUnixProcess(struct PRProcess *process);
-
-/************************************************************************/
-
-extern void _MD_EnableClockInterrupts(void);
-extern void _MD_DisableClockInterrupts(void);
-
-#define _MD_START_INTERRUPTS                    _MD_StartInterrupts
-#define _MD_STOP_INTERRUPTS                             _MD_StopInterrupts
-#define _MD_DISABLE_CLOCK_INTERRUPTS    _MD_DisableClockInterrupts
-#define _MD_ENABLE_CLOCK_INTERRUPTS             _MD_EnableClockInterrupts
-#define _MD_BLOCK_CLOCK_INTERRUPTS              _MD_BlockClockInterrupts
-#define _MD_UNBLOCK_CLOCK_INTERRUPTS    _MD_UnblockClockInterrupts
-
-/************************************************************************/
-
-extern void             _MD_InitCPUS(void);
-#define _MD_INIT_CPUS           _MD_InitCPUS
-
-extern void             _MD_Wakeup_CPUs(void);
-#define _MD_WAKEUP_CPUS _MD_Wakeup_CPUs
-
-#define _MD_PAUSE_CPU                   _MD_PauseCPU
-
-#ifndef IRIX
-#define _MD_EXIT(status)                _exit(status)
-#endif
-
-/************************************************************************/
-
-#define _MD_GET_ENV                             getenv
-#define _MD_PUT_ENV                             putenv
-
-/************************************************************************/
-
-#define _MD_INIT_FILEDESC(fd)
-
-/************************************************************************/
-
-#if !defined(_PR_PTHREADS)
-
-extern void             _MD_InitSegs(void);
-extern PRStatus _MD_AllocSegment(PRSegment *seg, PRUint32 size,
-                                void *vaddr);
-extern void             _MD_FreeSegment(PRSegment *seg);
-
-#define _MD_INIT_SEGS                   _MD_InitSegs
-#define _MD_ALLOC_SEGMENT               _MD_AllocSegment
-#define _MD_FREE_SEGMENT                _MD_FreeSegment
-
-#endif /* !defined(_PR_PTHREADS) */
-
-/************************************************************************/
-
 #if !defined(HPUX_LW_TIMER)
 #define _MD_INTERVAL_INIT()
@@ -328 +171 @@
 /************************************************************************/
 
-extern PRInt32 _MD_AvailableSocket(PRInt32 osfd);
-
-extern void _MD_StartInterrupts(void);
-extern void _MD_StopInterrupts(void);
-extern void _MD_DisableClockInterrupts(void);
-extern void _MD_BlockClockInterrupts(void);
-extern void _MD_UnblockClockInterrupts(void);
-extern void _MD_PauseCPU(PRIntervalTime timeout);
-
 /*
  * The standard (XPG4) gettimeofday() (from BSD) takes two arguments.
@@ -348 +182 @@
 #endif
 
-#if defined(_PR_PTHREADS) && !defined(_PR_POLL_AVAILABLE)
-#define _PR_NEED_FAKE_POLL
-#endif
-
-#if defined(_PR_NEED_FAKE_POLL)
-
-/*
- * Some platforms don't have poll(), but our pthreads code calls poll().
- * As a temporary measure, I implemented a fake poll() using select().
- * Here are the struct and macro definitions copied from sys/poll.h
- * on Solaris 2.5.
- */
-
-struct pollfd {
-    int fd;
-    short events;
-    short revents;
-};
-
-/* poll events */
-
-#define POLLIN          0x0001          /* fd is readable */
-#define POLLPRI         0x0002          /* high priority info at fd */
-#define POLLOUT         0x0004          /* fd is writeable (won't block) */
-#define POLLRDNORM      0x0040          /* normal data is readable */
-#define POLLWRNORM      POLLOUT
-#define POLLRDBAND      0x0080          /* out-of-band data is readable */
-#define POLLWRBAND      0x0100          /* out-of-band data is writeable */
-
-#define POLLNORM        POLLRDNORM
-
-#define POLLERR         0x0008          /* fd has error condition */
-#define POLLHUP         0x0010          /* fd has been hung up on */
-#define POLLNVAL        0x0020          /* invalid pollfd entry */
-
-extern int poll(struct pollfd *, unsigned long, int);
-
-#endif /* _PR_NEED_FAKE_POLL */
-
-/*
-** A vector of the UNIX I/O calls we use. These are here to smooth over
-** the rough edges needed for large files. All of NSPR's implmentaions
-** go through this vector using syntax of the form
-**      result = _md_iovector.xxx64(args);
-*/
-
-#if defined(SOLARIS2_5)
-/*
-** Special case: Solaris 2.5.1
-** Solaris starts to have 64-bit file I/O in 2.6.  We build on Solaris
-** 2.5.1 so that we can use the same binaries on both Solaris 2.5.1 and
-** 2.6.  At run time, we detect whether 64-bit file I/O is available by
-** looking up the 64-bit file function symbols in libc.  At build time,
-** we need to define the 64-bit file I/O datatypes that are compatible
-** with their definitions on Solaris 2.6.
-*/
-typedef PRInt64 off64_t;
-typedef PRUint64 ino64_t;
-typedef PRInt64 blkcnt64_t;
-struct stat64 {
-    dev_t st_dev;
-    long st_pad1[3];
-    ino64_t st_ino;
-    mode_t st_mode;
-    nlink_t st_nlink;
-    uid_t st_uid;    gid_t st_gid;
-    dev_t st_rdev;
-    long t_pad2[2];
-    off64_t st_size;
-    timestruc_t st_atim;
-    timestruc_t st_mtim;
-    timestruc_t st_ctim;
-    long st_blksize;
-    blkcnt64_t st_blocks;
-    char st_fstype[_ST_FSTYPSZ];
-    long st_pad4[8];
-};
-typedef struct stat64 _MDStat64;
-typedef off64_t _MDOff64_t;
-
-#elif defined(_PR_HAVE_OFF64_T)
-typedef struct stat64 _MDStat64;
-typedef off64_t _MDOff64_t;
-#elif defined(_PR_HAVE_LARGE_OFF_T)
-typedef struct stat _MDStat64;
-typedef off_t _MDOff64_t;
-#elif defined(_PR_NO_LARGE_FILES)
-typedef struct stat _MDStat64;
-typedef PRInt64 _MDOff64_t;
-#else
-#error "I don't know yet"
-#endif
-
-typedef PRIntn (*_MD_Fstat64)(PRIntn osfd, _MDStat64 *buf);
-typedef PRIntn (*_MD_Open64)(const char *path, int oflag, ...);
-#if defined(VMS)
-typedef PRIntn (*_MD_Stat64)(const char *path, _MDStat64 *buf, ...);
-#else
-typedef PRIntn (*_MD_Stat64)(const char *path, _MDStat64 *buf);
-#endif
-typedef _MDOff64_t (*_MD_Lseek64)(PRIntn osfd, _MDOff64_t, PRIntn whence);
-typedef void* (*_MD_Mmap64)(
-    void *addr, PRSize len, PRIntn prot, PRIntn flags,
-    PRIntn fildes, _MDOff64_t offset);
-struct _MD_IOVector
-{
-    _MD_Open64 _open64;
-    _MD_Mmap64 _mmap64;
-    _MD_Stat64 _stat64;
-    _MD_Fstat64 _fstat64;
-    _MD_Lseek64 _lseek64;
-};
-extern struct _MD_IOVector _md_iovector;
-
 #endif /* prunixos_h___ */