Remove unconditional define of HAVE_DEV_ZERO for solaris.

Add NEED_USLEEP_PROTOTYPE define for osf1.
Replace the osf specific ifdefs in widget with NEED_USLEEP_PROTOTYPE ifdefs.

configure.in

@@ -750,6 +750,7 @@ alpha*-*-osf*)
 	AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES)
 	AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
     fi
+    AC_DEFINE(NEED_USLEEP_PROTOTYPE)
     ;;
 
 *-qnx*) 
@@ -795,7 +796,6 @@ alpha*-*-osf*)
 dnl the qsort routine under solaris is faulty
 *-solaris*) 
     AC_DEFINE(BROKEN_QSORT)
-    HAVE_DEV_ZERO=1
     TARGET_NSPR_MDCPUCFG='\"md/_solaris32.cfg\"'
     if test -z "$GNU_CC"; then
        AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
@@ -1886,7 +1886,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 memmove)
+AC_CHECK_FUNCS(random qsort strerror lchown fchmod snprintf localtime_r statvfs memmove usleep)
 
 AC_MSG_CHECKING(how to call gettimeofday)
 AC_CACHE_VAL(ac_cv_gettimeofday_args,

widget/src/gtk/nsGtkUtils.cpp

@@ -29,16 +29,7 @@
 #include <gdk/gdkprivate.h>
 
 #ifdef NEED_USLEEP_PROTOTYPE
-extern int usleep(unsigned int);
-#endif
-#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
-** we define that the build breaks long before getting here.  So
-** put the prototype here explicitly.
-*/
-extern "C" int usleep(useconds_t);
+extern "C" int usleep(unsigned int);
 #endif
 #if defined(__QNX__)
 #define usleep(s)	sleep(s)

widget/src/gtk/nsWindow.cpp

@@ -55,6 +55,12 @@
 
 #include <unistd.h>
 
+#ifdef NEED_USLEEP_PROTOTYPE
+extern "C" int usleep(unsigned int);
+#endif
+#if defined(__QNX__)
+#define usleep(s)	sleep(s)
+#endif
 
 #undef DEBUG_DND_XLATE
 #define MODAL_TIMERS_BROKEN

widget/src/xlib/nsXUtils.cpp

@@ -25,14 +25,11 @@
 #include <unistd.h>
 #include <string.h>
 
-#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
-** we define that the build breaks long before getting here.  So
-** put the prototype here explicitly.
-*/
-extern "C" int usleep(useconds_t);
+#ifdef NEED_USLEEP_PROTOTYPE
+extern "C" int usleep(unsigned int);
+#endif
+#if defined(__QNX__)
+#define usleep(s)	sleep(s)
 #endif
 
 //////////////////////////////////////////////////////////////////