зеркало из https://github.com/mozilla/pjs.git
Removed check for usleep() as it did not fix the OSF/1 build and does not appear to be needed for anyone else
This commit is contained in:
Родитель
12c6995ea0
Коммит
f9ae73741c
|
@ -1775,7 +1775,7 @@ dnl Checks for library functions.
|
|||
dnl ========================================================
|
||||
AC_PROG_GCC_TRADITIONAL
|
||||
AC_FUNC_MEMCMP
|
||||
AC_CHECK_FUNCS(random qsort strerror lchown fchmod snprintf localtime_r statvfs usleep)
|
||||
AC_CHECK_FUNCS(random qsort strerror lchown fchmod snprintf localtime_r statvfs)
|
||||
|
||||
AC_MSG_CHECKING(how to call gettimeofday)
|
||||
AC_CACHE_VAL(ac_cv_gettimeofday_args,
|
||||
|
|
|
@ -24,11 +24,7 @@
|
|||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifndef HAVE_USLEEP
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#if defined(__osf__) && defined(HAVE_USLEEP) && !defined(_XOPEN_SOURCE_EXTENDED)
|
||||
#if defined(__osf__) && !defined(_XOPEN_SOURCE_EXTENDED)
|
||||
/*
|
||||
** DEC's compiler requires _XOPEN_SOURCE_EXTENDED to be defined in
|
||||
** order for it to see the prototype for usleep in unistd.h, but if
|
||||
|
@ -151,9 +147,6 @@ nsGtkUtils::gdk_window_flash(GdkWindow * aGdkWindow,
|
|||
int root_y;
|
||||
unsigned int i;
|
||||
XGCValues gcv;
|
||||
#ifndef HAVE_USLEEP
|
||||
struct timeval tv;
|
||||
#endif
|
||||
|
||||
display = GDK_WINDOW_XDISPLAY(aGdkWindow);
|
||||
|
||||
|
@ -219,13 +212,7 @@ nsGtkUtils::gdk_window_flash(GdkWindow * aGdkWindow,
|
|||
|
||||
XSync(display, False);
|
||||
|
||||
#ifdef HAVE_USLEEP
|
||||
usleep(aInterval);
|
||||
#else
|
||||
tv.tv_sec = aInterval / 100000;
|
||||
tv.tv_usec = aInterval % 100000;
|
||||
(void)select(0, NULL, NULL, NULL, &tv);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
||||
#if defined(__osf__) && defined(HAVE_USLEEP) && !defined(_XOPEN_SOURCE_EXTENDED)
|
||||
#if defined(__osf__) && !defined(_XOPEN_SOURCE_EXTENDED)
|
||||
/*
|
||||
** DEC's compiler requires _XOPEN_SOURCE_EXTENDED to be defined in
|
||||
** order for it to see the prototype for usleep in unistd.h, but if
|
||||
|
@ -52,9 +52,6 @@ nsXUtils::XFlashWindow(Display * aDisplay,
|
|||
int root_y;
|
||||
unsigned int i;
|
||||
XGCValues gcv;
|
||||
#ifndef HAVE_USLEEP
|
||||
struct timeval tv;
|
||||
#endif
|
||||
|
||||
XGetGeometry(aDisplay,
|
||||
aWindow,
|
||||
|
@ -116,13 +113,7 @@ nsXUtils::XFlashWindow(Display * aDisplay,
|
|||
|
||||
XSync(aDisplay, False);
|
||||
|
||||
#ifdef HAVE_USLEEP
|
||||
usleep(aInterval);
|
||||
#else
|
||||
tv.tv_sec = aInterval / 100000;
|
||||
tv.tv_usec = aInterval % 100000;
|
||||
(void)select(0, NULL, NULL, NULL, &tv);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче