Changeset 102239 in vbox

Timestamp:

Nov 22, 2023 10:16:52 AM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160364

Message:

libs/xpcom: Remove unused code in nsprpub, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/pr/include/md/_unixos.h (deleted)
• nsprpub/pr/include/md/prosdep.h (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -178 +178 @@
 NSPRPUB-MD-HEADERS_IFFLAGS = -m 644
 NSPRPUB-MD-HEADERS_SOURCES = \
-        nsprpub/pr/include/md/_unixos.h \
         nsprpub/pr/include/md/_pth.h \
         nsprpub/pr/include/md/prosdep.h

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

@@ -42 +42 @@
 ** Get OS specific header information
 */
-#include "prtypes.h"
-#include "prinrval.h"
+#include <unistd.h>
+#include <stddef.h>
+#include <errno.h>
 
 #ifndef XP_UNIX
@@ -55 +56 @@
 PR_BEGIN_EXTERN_C
 
-#if defined(LINUX) || defined(DARWIN) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
-
-NSPR_API(PRIntervalTime) _PR_UNIX_GetInterval(void);
-NSPR_API(PRIntervalTime) _PR_UNIX_TicksPerSecond(void);
-
-#define _MD_GET_INTERVAL                _PR_UNIX_GetInterval
-#define _MD_INTERVAL_PER_SEC            _PR_UNIX_TicksPerSecond
-
-#elif defined(SOLARIS)
-
-NSPR_API(PRIntervalTime) _MD_Solaris_GetInterval(void);
-NSPR_API(PRIntervalTime) _MD_Solaris_TicksPerSecond(void);
-
-# define _MD_GET_INTERVAL               _MD_Solaris_GetInterval
-# define _MD_INTERVAL_PER_SEC           _MD_Solaris_TicksPerSecond
-
+/*
+ * The standard (XPG4) gettimeofday() (from BSD) takes two arguments.
+ * On some SVR4 derivatives, gettimeofday() takes only one argument.
+ * The GETTIMEOFDAY macro is intended to hide this difference.
+ */
+#ifdef HAVE_SVID_GETTOD
+#define GETTIMEOFDAY(tp) gettimeofday(tp)
 #else
-# error unknown Unix flavor
+#define GETTIMEOFDAY(tp) gettimeofday((tp), NULL)
 #endif
 
-#include "md/_unixos.h"
+
 #include "md/_pth.h"